From 9cd3ff88f8b3ed85fe4f3dd7df96be9e7e17a83b Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Sat, 28 Mar 2026 09:00:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=E7=BB=9F=E4=B8=80=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - shared/ → common/（constant、enums、model） - framework/cache/config/ → framework/cache/（扁平化） - framework/integration/captcha/ → framework/captcha/ - config/property/ → 各模块 config/ 下 - interfaces/ → module/（sse、mail、sms） - 移除冗余枚举 LogModuleEnum --- README.md | 23 +++++---- .../boot/auth/controller/AuthController.java | 2 +- .../youlai/boot/auth/service/AuthService.java | 2 +- .../auth/service/impl/AuthServiceImpl.java | 11 +--- .../constant/SystemConstants.java | 2 +- .../enums/DataScopeEnum.java | 2 +- .../{shared => common}/enums/StatusEnum.java | 2 +- .../dto => common/model}/KeyValue.java | 2 +- .../{shared/dto => common/model}/Option.java | 2 +- .../cache/{config => }/CaffeineConfig.java | 2 +- .../cache/{config => }/RedisCacheConfig.java | 2 +- .../cache/{config => }/RedisConfig.java | 4 +- .../captcha/config/CaptchaConfig.java | 3 +- .../captcha/config}/CaptchaProperties.java | 2 +- .../captcha/exception/CaptchaException.java | 2 +- .../captcha/model/CaptchaInfo.java | 2 +- .../captcha/service/CaptchaService.java | 8 +-- .../integration/mail/config/MailConfig.java | 1 - .../mail/config}/MailProperties.java | 2 +- .../integration/mail/service/MailService.java | 4 +- .../sms/config}/AliyunSmsProperties.java | 2 +- .../sms/service/impl/AliyunSmsService.java | 2 +- .../wxma/{config => }/WxMaConfig.java | 3 +- .../integration/wxma}/WxMaProperties.java | 2 +- .../job/{config => }/XxlJobConfig.java | 2 +- .../config/MybatisConfig.java | 6 +-- .../handler/MyMetaObjectHandler.java | 2 +- .../interceptor/MyDataPermissionHandler.java | 4 +- .../openapi}/Knife4jOpenApiCustomizer.java | 2 +- .../openapi}/OpenApiConfig.java | 4 +- .../security/config/SecurityConfig.java | 10 +--- .../security/config}/SecurityProperties.java | 2 +- .../filter/CaptchaValidationFilter.java | 4 +- .../security/token/JwtTokenManager.java | 2 +- .../security/token/RedisTokenManager.java | 2 +- .../security/util/SecurityUtils.java | 2 +- .../web/filter/RateLimiterFilter.java | 2 +- .../interfaces/openapi/OpenApiController.java | 17 ------- .../codegen/config}/CodegenProperties.java | 2 +- .../codegen/controller/CodegenController.java | 2 +- .../module/codegen/mapper/DatabaseMapper.java | 14 ++---- .../codegen/model/bo/ColumnMetaData.java | 50 ------------------- .../module/codegen/model/vo/ColumnMetaVO.java | 26 ++++++++++ .../TableMetaVO.java} | 23 +-------- .../service/impl/CodegenServiceImpl.java | 2 +- .../service/impl/GenTableServiceImpl.java | 28 +++++------ .../sse/controller/SseController.java | 4 +- .../sse/dto/DictChangeEvent.java | 2 +- .../sse/dto/OnlineUserDTO.java | 2 +- .../sse/job/OnlineUserCountJob.java | 6 +-- .../sse/registry/SseSessionRegistry.java | 4 +- .../sse/service/SseService.java | 10 ++-- .../sse/topic/SseTopics.java | 2 +- .../boot/shared/enums/LogModuleEnum.java | 33 ------------ .../system/controller/DeptController.java | 2 +- .../system/controller/DictController.java | 4 +- .../system/controller/MenuController.java | 2 +- .../system/controller/RoleController.java | 2 +- .../system/controller/UserController.java | 2 +- .../system/converter/DictItemConverter.java | 2 +- .../boot/system/converter/RoleConverter.java | 4 +- .../boot/system/converter/UserConverter.java | 2 +- .../system/listener/UserImportListener.java | 4 +- .../boot/system/model/form/MenuForm.java | 2 +- .../boot/system/service/DeptService.java | 2 +- .../boot/system/service/DictService.java | 2 +- .../boot/system/service/MenuService.java | 2 +- .../boot/system/service/RoleService.java | 2 +- .../boot/system/service/UserService.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 6 +-- .../system/service/impl/DictServiceImpl.java | 2 +- .../system/service/impl/MenuServiceImpl.java | 8 +-- .../service/impl/NoticeServiceImpl.java | 4 +- .../system/service/impl/RoleServiceImpl.java | 6 +-- .../system/service/impl/UserServiceImpl.java | 4 +- .../mapper/codegen/DatabaseMapper.xml | 4 +- .../resources/mapper/system/UserMapper.xml | 4 +- .../security/token/JwtTokenManagerTest.java | 2 +- 78 files changed, 161 insertions(+), 275 deletions(-) rename src/main/java/com/youlai/boot/{shared => common}/constant/SystemConstants.java (91%) rename src/main/java/com/youlai/boot/{shared => common}/enums/DataScopeEnum.java (98%) rename src/main/java/com/youlai/boot/{shared => common}/enums/StatusEnum.java (91%) rename src/main/java/com/youlai/boot/{shared/dto => common/model}/KeyValue.java (92%) rename src/main/java/com/youlai/boot/{shared/dto => common/model}/Option.java (96%) rename src/main/java/com/youlai/boot/framework/cache/{config => }/CaffeineConfig.java (95%) rename src/main/java/com/youlai/boot/framework/cache/{config => }/RedisCacheConfig.java (98%) rename src/main/java/com/youlai/boot/framework/cache/{config => }/RedisConfig.java (92%) rename src/main/java/com/youlai/boot/framework/{integration => }/captcha/config/CaptchaConfig.java (92%) rename src/main/java/com/youlai/boot/{config/property => framework/captcha/config}/CaptchaProperties.java (97%) rename src/main/java/com/youlai/boot/framework/{integration => }/captcha/exception/CaptchaException.java (84%) rename src/main/java/com/youlai/boot/framework/{integration => }/captcha/model/CaptchaInfo.java (88%) rename src/main/java/com/youlai/boot/framework/{integration => }/captcha/service/CaptchaService.java (93%) rename src/main/java/com/youlai/boot/{config/property => framework/integration/mail/config}/MailProperties.java (97%) rename src/main/java/com/youlai/boot/{config/property => framework/integration/sms/config}/AliyunSmsProperties.java (94%) rename src/main/java/com/youlai/boot/framework/integration/wxma/{config => }/WxMaConfig.java (90%) rename src/main/java/com/youlai/boot/{config/property => framework/integration/wxma}/WxMaProperties.java (87%) rename src/main/java/com/youlai/boot/framework/job/{config => }/XxlJobConfig.java (97%) rename src/main/java/com/youlai/boot/framework/{persistence => mybatis}/config/MybatisConfig.java (91%) rename src/main/java/com/youlai/boot/framework/{persistence => mybatis}/handler/MyMetaObjectHandler.java (95%) rename src/main/java/com/youlai/boot/framework/{persistence => mybatis}/interceptor/MyDataPermissionHandler.java (98%) rename src/main/java/com/youlai/boot/{config => framework/openapi}/Knife4jOpenApiCustomizer.java (99%) rename src/main/java/com/youlai/boot/{config => framework/openapi}/OpenApiConfig.java (97%) rename src/main/java/com/youlai/boot/{config/property => framework/security/config}/SecurityProperties.java (98%) delete mode 100644 src/main/java/com/youlai/boot/interfaces/openapi/OpenApiController.java rename src/main/java/com/youlai/boot/{config/property => module/codegen/config}/CodegenProperties.java (97%) delete mode 100644 src/main/java/com/youlai/boot/module/codegen/model/bo/ColumnMetaData.java create mode 100644 src/main/java/com/youlai/boot/module/codegen/model/vo/ColumnMetaVO.java rename src/main/java/com/youlai/boot/module/codegen/model/{bo/TableMetaData.java => vo/TableMetaVO.java} (50%) rename src/main/java/com/youlai/boot/{interfaces => module}/sse/controller/SseController.java (93%) rename src/main/java/com/youlai/boot/{interfaces => module}/sse/dto/DictChangeEvent.java (95%) rename src/main/java/com/youlai/boot/{interfaces => module}/sse/dto/OnlineUserDTO.java (93%) rename src/main/java/com/youlai/boot/{interfaces => module}/sse/job/OnlineUserCountJob.java (85%) rename src/main/java/com/youlai/boot/{interfaces => module}/sse/registry/SseSessionRegistry.java (98%) rename src/main/java/com/youlai/boot/{interfaces => module}/sse/service/SseService.java (93%) rename src/main/java/com/youlai/boot/{interfaces => module}/sse/topic/SseTopics.java (88%) delete mode 100644 src/main/java/com/youlai/boot/shared/enums/LogModuleEnum.java diff --git a/README.md b/README.md index 37f3992a..2a14eb2a 100644 --- a/README.md +++ b/README.md @@ -104,15 +104,20 @@ youlai-boot ├── docker/ # Docker 部署 ├── sql/ # 数据库脚本 ├── src/main/java/com/youlai/boot/ -│ ├── auth/ # 认证模块 -│ ├── system/ # 系统模块（用户、角色、菜单、部门） -│ ├── module/ # 业务模块（文件、代码生成） -│ ├── framework/ # 技术中台（安全、缓存、持久化、集成） -│ ├── interfaces/ # 对外接口（SSE） -│ ├── shared/ # 跨模块共享（DTO、枚举、常量） -│ ├── common/ # 基础能力（结果、异常、切面、工具） -│ ├── config/ # 全局配置 -│ └── YouLaiBootApplication.java # 启动类 +│ ├── auth/ # 认证授权业务 +│ ├── common/ # 全局通用（常量、枚举、工具类、统一响应结果） +│ ├── framework/ # 底层技术基座（高内聚积木块） +│ │ ├── cache/ # Redis/Caffeine 缓存 +│ │ ├── captcha/ # 验证码 +│ │ ├── integration/ # SMS/Mail/WxMa 集成 +│ │ ├── job/ # XxlJob 定时任务 +│ │ ├── mybatis/ # 数据库/MP配置/拦截器 +│ │ ├── openapi/ # OpenAPI/Swagger 文档 +│ │ ├── security/ # 鉴权过滤器/Token机制 +│ │ └── web/ # 跨域/全局异常/限流/Jackson +│ ├── module/ # 业务模块（File、Codegen 等） +│ ├── system/ # 核心系统模块（用户/角色/菜单/部门） +│ └── YouLaiBootApplication.java # 启动类 └── pom.xml # Maven 配置 ``` diff --git a/src/main/java/com/youlai/boot/auth/controller/AuthController.java b/src/main/java/com/youlai/boot/auth/controller/AuthController.java index ae78c7eb..7a7975cf 100644 --- a/src/main/java/com/youlai/boot/auth/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/auth/controller/AuthController.java @@ -6,7 +6,7 @@ import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.result.Result; import com.youlai.boot.auth.service.AuthService; import com.youlai.boot.common.annotation.Log; -import com.youlai.boot.framework.integration.captcha.model.CaptchaInfo; +import com.youlai.boot.framework.captcha.model.CaptchaInfo; import com.youlai.boot.framework.security.model.AuthenticationToken; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/youlai/boot/auth/service/AuthService.java b/src/main/java/com/youlai/boot/auth/service/AuthService.java index 65ec2a52..2247b118 100644 --- a/src/main/java/com/youlai/boot/auth/service/AuthService.java +++ b/src/main/java/com/youlai/boot/auth/service/AuthService.java @@ -1,6 +1,6 @@ package com.youlai.boot.auth.service; -import com.youlai.boot.framework.integration.captcha.model.CaptchaInfo; +import com.youlai.boot.framework.captcha.model.CaptchaInfo; import com.youlai.boot.framework.security.model.AuthenticationToken; /** diff --git a/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java index f2ef1981..0f656436 100644 --- a/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java @@ -3,19 +3,15 @@ package com.youlai.boot.auth.service.impl; import cn.hutool.core.util.StrUtil; import com.youlai.boot.auth.service.AuthService; import com.youlai.boot.common.constant.RedisConstants; -import com.youlai.boot.common.enums.ActionTypeEnum; -import com.youlai.boot.common.util.IPUtils; -import com.youlai.boot.framework.integration.captcha.model.CaptchaInfo; -import com.youlai.boot.framework.integration.captcha.service.CaptchaService; +import com.youlai.boot.framework.captcha.model.CaptchaInfo; +import com.youlai.boot.framework.captcha.service.CaptchaService; import com.youlai.boot.framework.security.model.AuthenticationToken; import com.youlai.boot.framework.security.model.SmsAuthenticationToken; import com.youlai.boot.framework.security.token.TokenManager; import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum; import com.youlai.boot.framework.integration.sms.service.SmsService; -import com.youlai.boot.system.model.entity.SysLog; import com.youlai.boot.system.service.LogService; -import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; @@ -24,10 +20,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/youlai/boot/shared/constant/SystemConstants.java b/src/main/java/com/youlai/boot/common/constant/SystemConstants.java similarity index 91% rename from src/main/java/com/youlai/boot/shared/constant/SystemConstants.java rename to src/main/java/com/youlai/boot/common/constant/SystemConstants.java index 60b8197f..43489745 100644 --- a/src/main/java/com/youlai/boot/shared/constant/SystemConstants.java +++ b/src/main/java/com/youlai/boot/common/constant/SystemConstants.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.constant; +package com.youlai.boot.common.constant; /** * 系统常量 diff --git a/src/main/java/com/youlai/boot/shared/enums/DataScopeEnum.java b/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java similarity index 98% rename from src/main/java/com/youlai/boot/shared/enums/DataScopeEnum.java rename to src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java index a5b9b9d9..37a2636a 100644 --- a/src/main/java/com/youlai/boot/shared/enums/DataScopeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.enums; +package com.youlai.boot.common.enums; import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/shared/enums/StatusEnum.java b/src/main/java/com/youlai/boot/common/enums/StatusEnum.java similarity index 91% rename from src/main/java/com/youlai/boot/shared/enums/StatusEnum.java rename to src/main/java/com/youlai/boot/common/enums/StatusEnum.java index ccf883f7..229086fa 100644 --- a/src/main/java/com/youlai/boot/shared/enums/StatusEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/StatusEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.enums; +package com.youlai.boot.common.enums; import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/shared/dto/KeyValue.java b/src/main/java/com/youlai/boot/common/model/KeyValue.java similarity index 92% rename from src/main/java/com/youlai/boot/shared/dto/KeyValue.java rename to src/main/java/com/youlai/boot/common/model/KeyValue.java index 1f368540..8cc38ffa 100644 --- a/src/main/java/com/youlai/boot/shared/dto/KeyValue.java +++ b/src/main/java/com/youlai/boot/common/model/KeyValue.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.dto; +package com.youlai.boot.common.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/shared/dto/Option.java b/src/main/java/com/youlai/boot/common/model/Option.java similarity index 96% rename from src/main/java/com/youlai/boot/shared/dto/Option.java rename to src/main/java/com/youlai/boot/common/model/Option.java index 1e0e5c7d..78360f2a 100644 --- a/src/main/java/com/youlai/boot/shared/dto/Option.java +++ b/src/main/java/com/youlai/boot/common/model/Option.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.dto; +package com.youlai.boot.common.model; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/framework/cache/config/CaffeineConfig.java b/src/main/java/com/youlai/boot/framework/cache/CaffeineConfig.java similarity index 95% rename from src/main/java/com/youlai/boot/framework/cache/config/CaffeineConfig.java rename to src/main/java/com/youlai/boot/framework/cache/CaffeineConfig.java index 35871f1e..24c494d4 100644 --- a/src/main/java/com/youlai/boot/framework/cache/config/CaffeineConfig.java +++ b/src/main/java/com/youlai/boot/framework/cache/CaffeineConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.cache.config; +package com.youlai.boot.framework.cache; import com.github.benmanes.caffeine.cache.Caffeine; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/framework/cache/config/RedisCacheConfig.java b/src/main/java/com/youlai/boot/framework/cache/RedisCacheConfig.java similarity index 98% rename from src/main/java/com/youlai/boot/framework/cache/config/RedisCacheConfig.java rename to src/main/java/com/youlai/boot/framework/cache/RedisCacheConfig.java index b462e6a8..06b30707 100644 --- a/src/main/java/com/youlai/boot/framework/cache/config/RedisCacheConfig.java +++ b/src/main/java/com/youlai/boot/framework/cache/RedisCacheConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.cache.config; +package com.youlai.boot.framework.cache; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.cache.autoconfigure.CacheProperties; diff --git a/src/main/java/com/youlai/boot/framework/cache/config/RedisConfig.java b/src/main/java/com/youlai/boot/framework/cache/RedisConfig.java similarity index 92% rename from src/main/java/com/youlai/boot/framework/cache/config/RedisConfig.java rename to src/main/java/com/youlai/boot/framework/cache/RedisConfig.java index 571a5005..61e6a15e 100644 --- a/src/main/java/com/youlai/boot/framework/cache/config/RedisConfig.java +++ b/src/main/java/com/youlai/boot/framework/cache/RedisConfig.java @@ -1,9 +1,7 @@ -package com.youlai.boot.framework.cache.config; +package com.youlai.boot.framework.cache; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/boot/framework/integration/captcha/config/CaptchaConfig.java b/src/main/java/com/youlai/boot/framework/captcha/config/CaptchaConfig.java similarity index 92% rename from src/main/java/com/youlai/boot/framework/integration/captcha/config/CaptchaConfig.java rename to src/main/java/com/youlai/boot/framework/captcha/config/CaptchaConfig.java index 4456b308..2a890e69 100644 --- a/src/main/java/com/youlai/boot/framework/integration/captcha/config/CaptchaConfig.java +++ b/src/main/java/com/youlai/boot/framework/captcha/config/CaptchaConfig.java @@ -1,9 +1,8 @@ -package com.youlai.boot.framework.integration.captcha.config; +package com.youlai.boot.framework.captcha.config; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.MathGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import com.youlai.boot.config.property.CaptchaProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/boot/config/property/CaptchaProperties.java b/src/main/java/com/youlai/boot/framework/captcha/config/CaptchaProperties.java similarity index 97% rename from src/main/java/com/youlai/boot/config/property/CaptchaProperties.java rename to src/main/java/com/youlai/boot/framework/captcha/config/CaptchaProperties.java index 4067d51e..1ea87bf2 100644 --- a/src/main/java/com/youlai/boot/config/property/CaptchaProperties.java +++ b/src/main/java/com/youlai/boot/framework/captcha/config/CaptchaProperties.java @@ -1,4 +1,4 @@ -package com.youlai.boot.config.property; +package com.youlai.boot.framework.captcha.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/youlai/boot/framework/integration/captcha/exception/CaptchaException.java b/src/main/java/com/youlai/boot/framework/captcha/exception/CaptchaException.java similarity index 84% rename from src/main/java/com/youlai/boot/framework/integration/captcha/exception/CaptchaException.java rename to src/main/java/com/youlai/boot/framework/captcha/exception/CaptchaException.java index 63ea2ce2..61b95be9 100644 --- a/src/main/java/com/youlai/boot/framework/integration/captcha/exception/CaptchaException.java +++ b/src/main/java/com/youlai/boot/framework/captcha/exception/CaptchaException.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.integration.captcha.exception; +package com.youlai.boot.framework.captcha.exception; import com.youlai.boot.common.result.ResultCode; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/framework/integration/captcha/model/CaptchaInfo.java b/src/main/java/com/youlai/boot/framework/captcha/model/CaptchaInfo.java similarity index 88% rename from src/main/java/com/youlai/boot/framework/integration/captcha/model/CaptchaInfo.java rename to src/main/java/com/youlai/boot/framework/captcha/model/CaptchaInfo.java index ce31b2c4..ad845301 100644 --- a/src/main/java/com/youlai/boot/framework/integration/captcha/model/CaptchaInfo.java +++ b/src/main/java/com/youlai/boot/framework/captcha/model/CaptchaInfo.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.integration.captcha.model; +package com.youlai.boot.framework.captcha.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/youlai/boot/framework/integration/captcha/service/CaptchaService.java b/src/main/java/com/youlai/boot/framework/captcha/service/CaptchaService.java similarity index 93% rename from src/main/java/com/youlai/boot/framework/integration/captcha/service/CaptchaService.java rename to src/main/java/com/youlai/boot/framework/captcha/service/CaptchaService.java index b347db92..32ff0416 100644 --- a/src/main/java/com/youlai/boot/framework/integration/captcha/service/CaptchaService.java +++ b/src/main/java/com/youlai/boot/framework/captcha/service/CaptchaService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.integration.captcha.service; +package com.youlai.boot.framework.captcha.service; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CaptchaUtil; @@ -8,9 +8,9 @@ import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.enums.CaptchaTypeEnum; import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.config.property.CaptchaProperties; -import com.youlai.boot.framework.integration.captcha.exception.CaptchaException; -import com.youlai.boot.framework.integration.captcha.model.CaptchaInfo; +import com.youlai.boot.framework.captcha.config.CaptchaProperties; +import com.youlai.boot.framework.captcha.exception.CaptchaException; +import com.youlai.boot.framework.captcha.model.CaptchaInfo; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/framework/integration/mail/config/MailConfig.java b/src/main/java/com/youlai/boot/framework/integration/mail/config/MailConfig.java index 1a48e55e..687d2751 100644 --- a/src/main/java/com/youlai/boot/framework/integration/mail/config/MailConfig.java +++ b/src/main/java/com/youlai/boot/framework/integration/mail/config/MailConfig.java @@ -1,6 +1,5 @@ package com.youlai.boot.framework.integration.mail.config; -import com.youlai.boot.config.property.MailProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/boot/config/property/MailProperties.java b/src/main/java/com/youlai/boot/framework/integration/mail/config/MailProperties.java similarity index 97% rename from src/main/java/com/youlai/boot/config/property/MailProperties.java rename to src/main/java/com/youlai/boot/framework/integration/mail/config/MailProperties.java index 976ff29c..b8588b45 100644 --- a/src/main/java/com/youlai/boot/config/property/MailProperties.java +++ b/src/main/java/com/youlai/boot/framework/integration/mail/config/MailProperties.java @@ -1,4 +1,4 @@ -package com.youlai.boot.config.property; +package com.youlai.boot.framework.integration.mail.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/youlai/boot/framework/integration/mail/service/MailService.java b/src/main/java/com/youlai/boot/framework/integration/mail/service/MailService.java index 9923bf16..dbca6442 100644 --- a/src/main/java/com/youlai/boot/framework/integration/mail/service/MailService.java +++ b/src/main/java/com/youlai/boot/framework/integration/mail/service/MailService.java @@ -1,6 +1,6 @@ package com.youlai.boot.framework.integration.mail.service; -import com.youlai.boot.config.property.MailProperties; +import com.youlai.boot.framework.integration.mail.config.MailProperties; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import lombok.RequiredArgsConstructor; @@ -16,7 +16,7 @@ import java.io.File; /** * 邮件服务 * - * @author Ray + * @author Ray.Hao * @since 2024/8/17 */ @Service diff --git a/src/main/java/com/youlai/boot/config/property/AliyunSmsProperties.java b/src/main/java/com/youlai/boot/framework/integration/sms/config/AliyunSmsProperties.java similarity index 94% rename from src/main/java/com/youlai/boot/config/property/AliyunSmsProperties.java rename to src/main/java/com/youlai/boot/framework/integration/sms/config/AliyunSmsProperties.java index 138d9479..5bb590c9 100644 --- a/src/main/java/com/youlai/boot/config/property/AliyunSmsProperties.java +++ b/src/main/java/com/youlai/boot/framework/integration/sms/config/AliyunSmsProperties.java @@ -1,4 +1,4 @@ -package com.youlai.boot.config.property; +package com.youlai.boot.framework.integration.sms.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/youlai/boot/framework/integration/sms/service/impl/AliyunSmsService.java b/src/main/java/com/youlai/boot/framework/integration/sms/service/impl/AliyunSmsService.java index 1df6f484..8053b8f2 100644 --- a/src/main/java/com/youlai/boot/framework/integration/sms/service/impl/AliyunSmsService.java +++ b/src/main/java/com/youlai/boot/framework/integration/sms/service/impl/AliyunSmsService.java @@ -8,7 +8,7 @@ import com.aliyuncs.IAcsClient; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; -import com.youlai.boot.config.property.AliyunSmsProperties; +import com.youlai.boot.framework.integration.sms.config.AliyunSmsProperties; import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum; import com.youlai.boot.framework.integration.sms.service.SmsService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/framework/integration/wxma/config/WxMaConfig.java b/src/main/java/com/youlai/boot/framework/integration/wxma/WxMaConfig.java similarity index 90% rename from src/main/java/com/youlai/boot/framework/integration/wxma/config/WxMaConfig.java rename to src/main/java/com/youlai/boot/framework/integration/wxma/WxMaConfig.java index 1e94fc77..b7062694 100644 --- a/src/main/java/com/youlai/boot/framework/integration/wxma/config/WxMaConfig.java +++ b/src/main/java/com/youlai/boot/framework/integration/wxma/WxMaConfig.java @@ -1,9 +1,8 @@ -package com.youlai.boot.framework.integration.wxma.config; +package com.youlai.boot.framework.integration.wxma; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; -import com.youlai.boot.config.property.WxMaProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/boot/config/property/WxMaProperties.java b/src/main/java/com/youlai/boot/framework/integration/wxma/WxMaProperties.java similarity index 87% rename from src/main/java/com/youlai/boot/config/property/WxMaProperties.java rename to src/main/java/com/youlai/boot/framework/integration/wxma/WxMaProperties.java index 841bf613..4ed4f468 100644 --- a/src/main/java/com/youlai/boot/config/property/WxMaProperties.java +++ b/src/main/java/com/youlai/boot/framework/integration/wxma/WxMaProperties.java @@ -1,4 +1,4 @@ -package com.youlai.boot.config.property; +package com.youlai.boot.framework.integration.wxma; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/youlai/boot/framework/job/config/XxlJobConfig.java b/src/main/java/com/youlai/boot/framework/job/XxlJobConfig.java similarity index 97% rename from src/main/java/com/youlai/boot/framework/job/config/XxlJobConfig.java rename to src/main/java/com/youlai/boot/framework/job/XxlJobConfig.java index 30c14abe..9642ec2b 100644 --- a/src/main/java/com/youlai/boot/framework/job/config/XxlJobConfig.java +++ b/src/main/java/com/youlai/boot/framework/job/XxlJobConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.job.config; +package com.youlai.boot.framework.job; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/framework/persistence/config/MybatisConfig.java b/src/main/java/com/youlai/boot/framework/mybatis/config/MybatisConfig.java similarity index 91% rename from src/main/java/com/youlai/boot/framework/persistence/config/MybatisConfig.java rename to src/main/java/com/youlai/boot/framework/mybatis/config/MybatisConfig.java index 20684c70..a9e094cd 100644 --- a/src/main/java/com/youlai/boot/framework/persistence/config/MybatisConfig.java +++ b/src/main/java/com/youlai/boot/framework/mybatis/config/MybatisConfig.java @@ -1,12 +1,12 @@ -package com.youlai.boot.framework.persistence.config; +package com.youlai.boot.framework.mybatis.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.youlai.boot.framework.persistence.interceptor.MyDataPermissionHandler; -import com.youlai.boot.framework.persistence.handler.MyMetaObjectHandler; +import com.youlai.boot.framework.mybatis.handler.MyMetaObjectHandler; +import com.youlai.boot.framework.mybatis.interceptor.MyDataPermissionHandler; import org.apache.ibatis.mapping.DatabaseIdProvider; import org.apache.ibatis.mapping.VendorDatabaseIdProvider; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/youlai/boot/framework/persistence/handler/MyMetaObjectHandler.java b/src/main/java/com/youlai/boot/framework/mybatis/handler/MyMetaObjectHandler.java similarity index 95% rename from src/main/java/com/youlai/boot/framework/persistence/handler/MyMetaObjectHandler.java rename to src/main/java/com/youlai/boot/framework/mybatis/handler/MyMetaObjectHandler.java index 917cacbd..75b6f41f 100644 --- a/src/main/java/com/youlai/boot/framework/persistence/handler/MyMetaObjectHandler.java +++ b/src/main/java/com/youlai/boot/framework/mybatis/handler/MyMetaObjectHandler.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.persistence.handler; +package com.youlai.boot.framework.mybatis.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/framework/persistence/interceptor/MyDataPermissionHandler.java b/src/main/java/com/youlai/boot/framework/mybatis/interceptor/MyDataPermissionHandler.java similarity index 98% rename from src/main/java/com/youlai/boot/framework/persistence/interceptor/MyDataPermissionHandler.java rename to src/main/java/com/youlai/boot/framework/mybatis/interceptor/MyDataPermissionHandler.java index a6918f36..d2bd122e 100644 --- a/src/main/java/com/youlai/boot/framework/persistence/interceptor/MyDataPermissionHandler.java +++ b/src/main/java/com/youlai/boot/framework/mybatis/interceptor/MyDataPermissionHandler.java @@ -1,11 +1,11 @@ -package com.youlai.boot.framework.persistence.interceptor; +package com.youlai.boot.framework.mybatis.interceptor; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; import com.youlai.boot.common.annotation.DataPermission; -import com.youlai.boot.shared.enums.DataScopeEnum; +import com.youlai.boot.common.enums.DataScopeEnum; import com.youlai.boot.framework.security.model.RoleDataScope; import com.youlai.boot.framework.security.model.SysUserDetails; import com.youlai.boot.framework.security.util.SecurityUtils; diff --git a/src/main/java/com/youlai/boot/config/Knife4jOpenApiCustomizer.java b/src/main/java/com/youlai/boot/framework/openapi/Knife4jOpenApiCustomizer.java similarity index 99% rename from src/main/java/com/youlai/boot/config/Knife4jOpenApiCustomizer.java rename to src/main/java/com/youlai/boot/framework/openapi/Knife4jOpenApiCustomizer.java index b41e151d..b2dd5b2d 100644 --- a/src/main/java/com/youlai/boot/config/Knife4jOpenApiCustomizer.java +++ b/src/main/java/com/youlai/boot/framework/openapi/Knife4jOpenApiCustomizer.java @@ -1,4 +1,4 @@ -package com.youlai.boot.config; +package com.youlai.boot.framework.openapi; import com.github.xiaoymin.knife4j.annotations.ApiSupport; diff --git a/src/main/java/com/youlai/boot/config/OpenApiConfig.java b/src/main/java/com/youlai/boot/framework/openapi/OpenApiConfig.java similarity index 97% rename from src/main/java/com/youlai/boot/config/OpenApiConfig.java rename to src/main/java/com/youlai/boot/framework/openapi/OpenApiConfig.java index 5e6c2d54..1f43c50a 100644 --- a/src/main/java/com/youlai/boot/config/OpenApiConfig.java +++ b/src/main/java/com/youlai/boot/framework/openapi/OpenApiConfig.java @@ -1,7 +1,7 @@ -package com.youlai.boot.config; +package com.youlai.boot.framework.openapi; import cn.hutool.core.util.ArrayUtil; -import com.youlai.boot.config.property.SecurityProperties; +import com.youlai.boot.framework.security.config.SecurityProperties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; diff --git a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java index 404ca27c..68359818 100644 --- a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java @@ -1,9 +1,8 @@ package com.youlai.boot.framework.security.config; import cn.binarywang.wx.miniapp.api.WxMaService; -import com.youlai.boot.framework.integration.captcha.service.CaptchaService; +import com.youlai.boot.framework.captcha.service.CaptchaService; import cn.hutool.core.util.ArrayUtil; -import com.youlai.boot.config.property.SecurityProperties; import com.youlai.boot.framework.web.filter.RateLimiterFilter; import com.youlai.boot.framework.security.filter.CaptchaValidationFilter; import com.youlai.boot.framework.security.filter.TokenAuthenticationFilter; @@ -32,9 +31,6 @@ import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; - -import java.util.*; /** * Spring Security 配置类 @@ -59,10 +55,6 @@ public class SecurityConfig { private final ConfigService configService; private final SecurityProperties securityProperties; - private final WxMaService wxMaService; - - private final RequestMappingHandlerMapping requestMappingHandlerMapping; - /** * 配置安全过滤链 SecurityFilterChain */ diff --git a/src/main/java/com/youlai/boot/config/property/SecurityProperties.java b/src/main/java/com/youlai/boot/framework/security/config/SecurityProperties.java similarity index 98% rename from src/main/java/com/youlai/boot/config/property/SecurityProperties.java rename to src/main/java/com/youlai/boot/framework/security/config/SecurityProperties.java index 5e4b3725..ce5d4604 100644 --- a/src/main/java/com/youlai/boot/config/property/SecurityProperties.java +++ b/src/main/java/com/youlai/boot/framework/security/config/SecurityProperties.java @@ -1,4 +1,4 @@ -package com.youlai.boot.config.property; +package com.youlai.boot.framework.security.config; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotEmpty; diff --git a/src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java b/src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java index c928a0df..4f1d6fcb 100644 --- a/src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java +++ b/src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java @@ -6,8 +6,8 @@ import cn.hutool.json.JSONUtil; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.result.ResponseWriter; -import com.youlai.boot.framework.integration.captcha.exception.CaptchaException; -import com.youlai.boot.framework.integration.captcha.service.CaptchaService; +import com.youlai.boot.framework.captcha.exception.CaptchaException; +import com.youlai.boot.framework.captcha.service.CaptchaService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.ServletInputStream; diff --git a/src/main/java/com/youlai/boot/framework/security/token/JwtTokenManager.java b/src/main/java/com/youlai/boot/framework/security/token/JwtTokenManager.java index 68a1d911..10966bd5 100644 --- a/src/main/java/com/youlai/boot/framework/security/token/JwtTokenManager.java +++ b/src/main/java/com/youlai/boot/framework/security/token/JwtTokenManager.java @@ -14,7 +14,7 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.config.property.SecurityProperties; +import com.youlai.boot.framework.security.config.SecurityProperties; import com.youlai.boot.framework.security.model.AuthenticationToken; import com.youlai.boot.framework.security.model.RoleDataScope; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/youlai/boot/framework/security/token/RedisTokenManager.java b/src/main/java/com/youlai/boot/framework/security/token/RedisTokenManager.java index 03d540a2..f054243f 100644 --- a/src/main/java/com/youlai/boot/framework/security/token/RedisTokenManager.java +++ b/src/main/java/com/youlai/boot/framework/security/token/RedisTokenManager.java @@ -7,7 +7,7 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.config.property.SecurityProperties; +import com.youlai.boot.framework.security.config.SecurityProperties; import com.youlai.boot.framework.security.model.AuthenticationToken; import com.youlai.boot.framework.security.model.UserSession; import com.youlai.boot.framework.security.model.SysUserDetails; diff --git a/src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java b/src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java index 106c11f2..3fed56b1 100644 --- a/src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java +++ b/src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java @@ -3,7 +3,7 @@ package com.youlai.boot.framework.security.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.SecurityConstants; -import com.youlai.boot.shared.constant.SystemConstants; +import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.framework.security.model.RoleDataScope; import com.youlai.boot.framework.security.model.SysUserDetails; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/youlai/boot/framework/web/filter/RateLimiterFilter.java b/src/main/java/com/youlai/boot/framework/web/filter/RateLimiterFilter.java index a815c4c1..5b860442 100644 --- a/src/main/java/com/youlai/boot/framework/web/filter/RateLimiterFilter.java +++ b/src/main/java/com/youlai/boot/framework/web/filter/RateLimiterFilter.java @@ -3,7 +3,7 @@ package com.youlai.boot.framework.web.filter; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.RedisConstants; -import com.youlai.boot.shared.constant.SystemConstants; +import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.util.IPUtils; import com.youlai.boot.common.result.ResponseWriter; diff --git a/src/main/java/com/youlai/boot/interfaces/openapi/OpenApiController.java b/src/main/java/com/youlai/boot/interfaces/openapi/OpenApiController.java deleted file mode 100644 index 9a04a8da..00000000 --- a/src/main/java/com/youlai/boot/interfaces/openapi/OpenApiController.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.youlai.boot.interfaces.openapi; - -/** - * 开放 API 控制器 - *

- * 面向第三方系统的开放接口，使用 API Key 认证 - *

- */ -// @RestController -// @RequestMapping("/api/v1/open") -// @Api(tags = "开放API") -public class OpenApiController { - - // TODO: 实现 API Key 认证拦截器 - // TODO: 定义开放接口规范 - -} diff --git a/src/main/java/com/youlai/boot/config/property/CodegenProperties.java b/src/main/java/com/youlai/boot/module/codegen/config/CodegenProperties.java similarity index 97% rename from src/main/java/com/youlai/boot/config/property/CodegenProperties.java rename to src/main/java/com/youlai/boot/module/codegen/config/CodegenProperties.java index 80cc2275..85b2e639 100644 --- a/src/main/java/com/youlai/boot/config/property/CodegenProperties.java +++ b/src/main/java/com/youlai/boot/module/codegen/config/CodegenProperties.java @@ -1,4 +1,4 @@ -package com.youlai.boot.config.property; +package com.youlai.boot.module.codegen.config; import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.map.MapUtil; diff --git a/src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java index ebe05416..ed2c6f09 100644 --- a/src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java +++ b/src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java @@ -3,7 +3,7 @@ package com.youlai.boot.module.codegen.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; -import com.youlai.boot.config.property.CodegenProperties; +import com.youlai.boot.module.codegen.config.CodegenProperties; import com.youlai.boot.common.enums.ActionTypeEnum; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.module.codegen.service.CodegenService; diff --git a/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java index 2acddf3c..dfcc0685 100644 --- a/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java @@ -2,8 +2,8 @@ package com.youlai.boot.module.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.codegen.model.bo.ColumnMetaData; -import com.youlai.boot.module.codegen.model.bo.TableMetaData; +import com.youlai.boot.module.codegen.model.vo.ColumnMetaVO; +import com.youlai.boot.module.codegen.model.vo.TableMetaVO; import com.youlai.boot.module.codegen.model.query.TableQuery; import com.youlai.boot.module.codegen.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; @@ -35,13 +35,7 @@ public interface DatabaseMapper extends BaseMapper { * @param tableName * @return */ - List getTableColumns(String tableName); + List getTableColumns(String tableName); - /** - * 获取表元数据 - * - * @param tableName - * @return - */ - TableMetaData getTableMetadata(String tableName); + TableMetaVO getTableMetadata(String tableName); } diff --git a/src/main/java/com/youlai/boot/module/codegen/model/bo/ColumnMetaData.java b/src/main/java/com/youlai/boot/module/codegen/model/bo/ColumnMetaData.java deleted file mode 100644 index d70ddb74..00000000 --- a/src/main/java/com/youlai/boot/module/codegen/model/bo/ColumnMetaData.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.youlai.boot.module.codegen.model.bo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "数据表字段Vo") -@Data -public class ColumnMetaData { - - /** - * 字段名称 - */ - private String columnName; - - /** - * 字段类型 - */ - private String dataType; - - /** - * 字段描述 - */ - private String columnComment; - - /** - * 字段长度 - */ - private Long characterMaximumLength; - - /** - * 是否主键(1-是 0-否) - */ - private Integer isPrimaryKey; - - /** - * 是否可为空(1-是 0-否) - */ - private String isNullable; - - /** - * 字符集 - */ - private String characterSetName; - - /** - * 排序规则 - */ - private String collationName; - -} diff --git a/src/main/java/com/youlai/boot/module/codegen/model/vo/ColumnMetaVO.java b/src/main/java/com/youlai/boot/module/codegen/model/vo/ColumnMetaVO.java new file mode 100644 index 00000000..725746f7 --- /dev/null +++ b/src/main/java/com/youlai/boot/module/codegen/model/vo/ColumnMetaVO.java @@ -0,0 +1,26 @@ +package com.youlai.boot.module.codegen.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "数据表字段元数据") +@Data +public class ColumnMetaVO { + + private String columnName; + + private String dataType; + + private String columnComment; + + private Long characterMaximumLength; + + private Integer isPrimaryKey; + + private String isNullable; + + private String characterSetName; + + private String collationName; + +} diff --git a/src/main/java/com/youlai/boot/module/codegen/model/bo/TableMetaData.java b/src/main/java/com/youlai/boot/module/codegen/model/vo/TableMetaVO.java similarity index 50% rename from src/main/java/com/youlai/boot/module/codegen/model/bo/TableMetaData.java rename to src/main/java/com/youlai/boot/module/codegen/model/vo/TableMetaVO.java index 028bbfb8..4df1bfe4 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/bo/TableMetaData.java +++ b/src/main/java/com/youlai/boot/module/codegen/model/vo/TableMetaVO.java @@ -1,8 +1,7 @@ -package com.youlai.boot.module.codegen.model.bo; +package com.youlai.boot.module.codegen.model.vo; import lombok.Data; - /** * 数据表元数据 * @@ -10,36 +9,18 @@ import lombok.Data; * @since 2.10.0 */ @Data -public class TableMetaData { +public class TableMetaVO { - /** - * 表名称 - */ private String tableName; - /** - * 表描述 - */ private String tableComment; - /** - * 排序规则 - */ private String tableCollation; - /** - * 存储引擎 - */ private String engine; - /** - * 字符集 - */ private String charset; - /** - * 创建时间 - */ private String createTime; } diff --git a/src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java index 5e2125c4..09800cbd 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java @@ -12,7 +12,7 @@ import cn.hutool.extra.template.TemplateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.module.codegen.enums.JavaTypeEnum; -import com.youlai.boot.config.property.CodegenProperties; +import com.youlai.boot.module.codegen.config.CodegenProperties; import com.youlai.boot.module.codegen.service.GenTableService; import com.youlai.boot.module.codegen.service.GenTableColumnService; import com.youlai.boot.module.codegen.service.CodegenService; diff --git a/src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableServiceImpl.java b/src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableServiceImpl.java index 2ab5a592..f4f888ec 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableServiceImpl.java @@ -11,12 +11,12 @@ import com.youlai.boot.module.codegen.enums.FormTypeEnum; import com.youlai.boot.module.codegen.enums.JavaTypeEnum; import com.youlai.boot.module.codegen.enums.QueryTypeEnum; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.config.property.CodegenProperties; +import com.youlai.boot.module.codegen.config.CodegenProperties; import com.youlai.boot.module.codegen.converter.CodegenConverter; import com.youlai.boot.module.codegen.mapper.DatabaseMapper; import com.youlai.boot.module.codegen.mapper.GenTableMapper; -import com.youlai.boot.module.codegen.model.bo.ColumnMetaData; -import com.youlai.boot.module.codegen.model.bo.TableMetaData; +import com.youlai.boot.module.codegen.model.vo.ColumnMetaVO; +import com.youlai.boot.module.codegen.model.vo.TableMetaVO; import com.youlai.boot.module.codegen.model.entity.GenTable; import com.youlai.boot.module.codegen.model.entity.GenTableColumn; import com.youlai.boot.module.codegen.model.form.GenConfigForm; @@ -72,7 +72,7 @@ public class GenTableServiceImpl extends ServiceImpl i // 如果没有代码生成配置，则根据表的元数据生成默认配置 if (genTable == null) { - TableMetaData tableMetadata = databaseMapper.getTableMetadata(tableName); + TableMetaVO tableMetadata = databaseMapper.getTableMetadata(tableName); Assert.isTrue(tableMetadata != null, "未找到表元数据"); genTable = new GenTable(); @@ -100,7 +100,7 @@ public class GenTableServiceImpl extends ServiceImpl i List genTableColumns = new ArrayList<>(); // 获取表的列 - List tableColumns = databaseMapper.getTableColumns(tableName); + List tableColumns = databaseMapper.getTableColumns(tableName); if (CollectionUtil.isNotEmpty(tableColumns)) { // 查询字段生成配置 List fieldConfigList = genTableColumnService.list( @@ -113,7 +113,7 @@ public class GenTableServiceImpl extends ServiceImpl i .filter(Objects::nonNull) // 过滤掉空值 .max(Integer::compareTo) .orElse(0); - for (ColumnMetaData tableColumn : tableColumns) { + for (ColumnMetaVO tableColumn : tableColumns) { // 根据列名获取字段生成配置 String columnName = tableColumn.getColumnName(); GenTableColumn fieldConfig = fieldConfigList.stream() @@ -150,16 +150,16 @@ public class GenTableServiceImpl extends ServiceImpl i /** * 创建默认字段配置 * - * @param columnMetaData 表字段元数据 + * @param columnMetaVO 表字段元数据 * @return */ - private GenTableColumn createDefaultFieldConfig(ColumnMetaData columnMetaData) { + private GenTableColumn createDefaultFieldConfig(ColumnMetaVO columnMetaVO) { GenTableColumn fieldConfig = new GenTableColumn(); - fieldConfig.setColumnName(columnMetaData.getColumnName()); - fieldConfig.setColumnType(columnMetaData.getDataType()); - fieldConfig.setFieldComment(columnMetaData.getColumnComment()); - fieldConfig.setFieldName(StrUtil.toCamelCase(columnMetaData.getColumnName())); - fieldConfig.setIsRequired("YES".equals(columnMetaData.getIsNullable()) ? 0 : 1); + fieldConfig.setColumnName(columnMetaVO.getColumnName()); + fieldConfig.setColumnType(columnMetaVO.getDataType()); + fieldConfig.setFieldComment(columnMetaVO.getColumnComment()); + fieldConfig.setFieldName(StrUtil.toCamelCase(columnMetaVO.getColumnName())); + fieldConfig.setIsRequired("YES".equals(columnMetaVO.getIsNullable()) ? 0 : 1); String columnType = StrUtil.blankToDefault(fieldConfig.getColumnType(), "").toLowerCase(); if ("date".equals(columnType)) { @@ -171,7 +171,7 @@ public class GenTableServiceImpl extends ServiceImpl i } fieldConfig.setQueryType(QueryTypeEnum.EQ); - fieldConfig.setMaxLength(columnMetaData.getCharacterMaximumLength()); + fieldConfig.setMaxLength(columnMetaVO.getCharacterMaximumLength()); return fieldConfig; } diff --git a/src/main/java/com/youlai/boot/interfaces/sse/controller/SseController.java b/src/main/java/com/youlai/boot/module/sse/controller/SseController.java similarity index 93% rename from src/main/java/com/youlai/boot/interfaces/sse/controller/SseController.java rename to src/main/java/com/youlai/boot/module/sse/controller/SseController.java index 3ed4e883..b1fa0490 100644 --- a/src/main/java/com/youlai/boot/interfaces/sse/controller/SseController.java +++ b/src/main/java/com/youlai/boot/module/sse/controller/SseController.java @@ -1,9 +1,9 @@ -package com.youlai.boot.interfaces.sse.controller; +package com.youlai.boot.module.sse.controller; import com.youlai.boot.common.result.Result; import com.youlai.boot.framework.security.model.SysUserDetails; import com.youlai.boot.framework.security.util.SecurityUtils; -import com.youlai.boot.interfaces.sse.service.SseService; +import com.youlai.boot.module.sse.service.SseService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/interfaces/sse/dto/DictChangeEvent.java b/src/main/java/com/youlai/boot/module/sse/dto/DictChangeEvent.java similarity index 95% rename from src/main/java/com/youlai/boot/interfaces/sse/dto/DictChangeEvent.java rename to src/main/java/com/youlai/boot/module/sse/dto/DictChangeEvent.java index ecb43a24..bdb5d906 100644 --- a/src/main/java/com/youlai/boot/interfaces/sse/dto/DictChangeEvent.java +++ b/src/main/java/com/youlai/boot/module/sse/dto/DictChangeEvent.java @@ -1,4 +1,4 @@ -package com.youlai.boot.interfaces.sse.dto; +package com.youlai.boot.module.sse.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/interfaces/sse/dto/OnlineUserDTO.java b/src/main/java/com/youlai/boot/module/sse/dto/OnlineUserDTO.java similarity index 93% rename from src/main/java/com/youlai/boot/interfaces/sse/dto/OnlineUserDTO.java rename to src/main/java/com/youlai/boot/module/sse/dto/OnlineUserDTO.java index 1956c7af..0dac4ea3 100644 --- a/src/main/java/com/youlai/boot/interfaces/sse/dto/OnlineUserDTO.java +++ b/src/main/java/com/youlai/boot/module/sse/dto/OnlineUserDTO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.interfaces.sse.dto; +package com.youlai.boot.module.sse.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/interfaces/sse/job/OnlineUserCountJob.java b/src/main/java/com/youlai/boot/module/sse/job/OnlineUserCountJob.java similarity index 85% rename from src/main/java/com/youlai/boot/interfaces/sse/job/OnlineUserCountJob.java rename to src/main/java/com/youlai/boot/module/sse/job/OnlineUserCountJob.java index f3ccc55e..d446558f 100644 --- a/src/main/java/com/youlai/boot/interfaces/sse/job/OnlineUserCountJob.java +++ b/src/main/java/com/youlai/boot/module/sse/job/OnlineUserCountJob.java @@ -1,7 +1,7 @@ -package com.youlai.boot.interfaces.sse.job; +package com.youlai.boot.module.sse.job; -import com.youlai.boot.interfaces.sse.registry.SseSessionRegistry; -import com.youlai.boot.interfaces.sse.service.SseService; +import com.youlai.boot.module.sse.registry.SseSessionRegistry; +import com.youlai.boot.module.sse.service.SseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/youlai/boot/interfaces/sse/registry/SseSessionRegistry.java b/src/main/java/com/youlai/boot/module/sse/registry/SseSessionRegistry.java similarity index 98% rename from src/main/java/com/youlai/boot/interfaces/sse/registry/SseSessionRegistry.java rename to src/main/java/com/youlai/boot/module/sse/registry/SseSessionRegistry.java index 081c6c30..d31ad733 100644 --- a/src/main/java/com/youlai/boot/interfaces/sse/registry/SseSessionRegistry.java +++ b/src/main/java/com/youlai/boot/module/sse/registry/SseSessionRegistry.java @@ -1,6 +1,6 @@ -package com.youlai.boot.interfaces.sse.registry; +package com.youlai.boot.module.sse.registry; -import com.youlai.boot.interfaces.sse.dto.OnlineUserDTO; +import com.youlai.boot.module.sse.dto.OnlineUserDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; diff --git a/src/main/java/com/youlai/boot/interfaces/sse/service/SseService.java b/src/main/java/com/youlai/boot/module/sse/service/SseService.java similarity index 93% rename from src/main/java/com/youlai/boot/interfaces/sse/service/SseService.java rename to src/main/java/com/youlai/boot/module/sse/service/SseService.java index ea22881d..3aa1d157 100644 --- a/src/main/java/com/youlai/boot/interfaces/sse/service/SseService.java +++ b/src/main/java/com/youlai/boot/module/sse/service/SseService.java @@ -1,9 +1,9 @@ -package com.youlai.boot.interfaces.sse.service; +package com.youlai.boot.module.sse.service; -import com.youlai.boot.interfaces.sse.dto.DictChangeEvent; -import com.youlai.boot.interfaces.sse.dto.OnlineUserDTO; -import com.youlai.boot.interfaces.sse.registry.SseSessionRegistry; -import com.youlai.boot.interfaces.sse.topic.SseTopics; +import com.youlai.boot.module.sse.dto.DictChangeEvent; +import com.youlai.boot.module.sse.dto.OnlineUserDTO; +import com.youlai.boot.module.sse.registry.SseSessionRegistry; +import com.youlai.boot.module.sse.topic.SseTopics; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/interfaces/sse/topic/SseTopics.java b/src/main/java/com/youlai/boot/module/sse/topic/SseTopics.java similarity index 88% rename from src/main/java/com/youlai/boot/interfaces/sse/topic/SseTopics.java rename to src/main/java/com/youlai/boot/module/sse/topic/SseTopics.java index 542ce1aa..f2894278 100644 --- a/src/main/java/com/youlai/boot/interfaces/sse/topic/SseTopics.java +++ b/src/main/java/com/youlai/boot/module/sse/topic/SseTopics.java @@ -1,4 +1,4 @@ -package com.youlai.boot.interfaces.sse.topic; +package com.youlai.boot.module.sse.topic; /** * SSE 主题常量 diff --git a/src/main/java/com/youlai/boot/shared/enums/LogModuleEnum.java b/src/main/java/com/youlai/boot/shared/enums/LogModuleEnum.java deleted file mode 100644 index a090f730..00000000 --- a/src/main/java/com/youlai/boot/shared/enums/LogModuleEnum.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.youlai.boot.shared.enums; - -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; - -/** - * 日志模块枚举 - * - * @author Ray - * @since 2.10.0 - */ -@Schema(enumAsRef = true) -@Getter -public enum LogModuleEnum { - - EXCEPTION("异常"), - LOGIN("登录"), - USER("用户"), - DEPT("部门"), - ROLE("角色"), - MENU("菜单"), - DICT("字典"), - SETTING("系统配置"), - OTHER("其他"); - - @JsonValue - private final String moduleName; - - LogModuleEnum(String moduleName) { - this.moduleName = moduleName; - } -} \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/controller/DeptController.java b/src/main/java/com/youlai/boot/system/controller/DeptController.java index f3e6ea09..7a54a8fd 100644 --- a/src/main/java/com/youlai/boot/system/controller/DeptController.java +++ b/src/main/java/com/youlai/boot/system/controller/DeptController.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.controller; import com.youlai.boot.common.enums.ActionTypeEnum; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.annotation.RepeatSubmit; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.DeptForm; import com.youlai.boot.system.model.query.DeptQuery; diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java index 57090140..268cb2d7 100644 --- a/src/main/java/com/youlai/boot/system/controller/DictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.common.enums.ActionTypeEnum; @@ -17,7 +17,7 @@ import com.youlai.boot.system.model.form.DictForm; import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.service.DictItemService; import com.youlai.boot.system.service.DictService; -import com.youlai.boot.interfaces.sse.service.SseService; +import com.youlai.boot.module.sse.service.SseService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/youlai/boot/system/controller/MenuController.java b/src/main/java/com/youlai/boot/system/controller/MenuController.java index 093e6d77..1050803c 100644 --- a/src/main/java/com/youlai/boot/system/controller/MenuController.java +++ b/src/main/java/com/youlai/boot/system/controller/MenuController.java @@ -4,7 +4,7 @@ import com.youlai.boot.common.annotation.Log; import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.enums.ActionTypeEnum; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.system.model.query.MenuQuery; diff --git a/src/main/java/com/youlai/boot/system/controller/RoleController.java b/src/main/java/com/youlai/boot/system/controller/RoleController.java index 0776ef6a..edc7665a 100644 --- a/src/main/java/com/youlai/boot/system/controller/RoleController.java +++ b/src/main/java/com/youlai/boot/system/controller/RoleController.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.common.enums.ActionTypeEnum; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.annotation.RepeatSubmit; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.RoleForm; diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java index aae8eca0..27f427f3 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -8,7 +8,7 @@ import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.enums.ActionTypeEnum; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.framework.security.util.SecurityUtils; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.ExcelResult; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; diff --git a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java index 60477288..99a354b0 100644 --- a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.form.DictItemForm; import com.youlai.boot.system.model.vo.DictPageVO; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import org.mapstruct.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/boot/system/converter/RoleConverter.java b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java index 7e016ffe..865782f0 100644 --- a/src/main/java/com/youlai/boot/system/converter/RoleConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.entity.Role; import com.youlai.boot.system.model.vo.RolePageVO; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.form.RoleForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -21,7 +21,7 @@ import java.util.List; public interface RoleConverter { @Mapping(target = "dataScope", source = "dataScope") - @Mapping(target = "dataScopeLabel", expression = "java(com.youlai.boot.shared.enums.DataScopeEnum.getByValue(role.getDataScope()) == null ? null : com.youlai.boot.shared.enums.DataScopeEnum.getByValue(role.getDataScope()).getLabel())") + @Mapping(target = "dataScopeLabel", expression = "java(com.youlai.boot.common.enums.DataScopeEnum.getByValue(role.getDataScope()) == null ? null : com.youlai.boot.common.enums.DataScopeEnum.getByValue(role.getDataScope()).getLabel())") RolePageVO toPageVo(Role role); Page toPageVo(Page page); diff --git a/src/main/java/com/youlai/boot/system/converter/UserConverter.java b/src/main/java/com/youlai/boot/system/converter/UserConverter.java index b7a6c782..806db616 100644 --- a/src/main/java/com/youlai/boot/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/UserConverter.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.entity.SysUser; import com.youlai.boot.system.model.vo.CurrentUserVO; import com.youlai.boot.system.model.form.UserForm; diff --git a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java index bcfa1a15..236a86ea 100644 --- a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java +++ b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java @@ -9,8 +9,8 @@ import cn.hutool.json.JSONUtil; import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.event.AnalysisEventListener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.youlai.boot.shared.constant.SystemConstants; -import com.youlai.boot.shared.enums.StatusEnum; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.StatusEnum; import com.youlai.boot.common.result.ExcelResult; import com.youlai.boot.system.converter.UserConverter; import com.youlai.boot.system.enums.DictCodeEnum; diff --git a/src/main/java/com/youlai/boot/system/model/form/MenuForm.java b/src/main/java/com/youlai/boot/system/model/form/MenuForm.java index 886130ca..dabc73ce 100644 --- a/src/main/java/com/youlai/boot/system/model/form/MenuForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/MenuForm.java @@ -1,6 +1,6 @@ package com.youlai.boot.system.model.form; -import com.youlai.boot.shared.dto.KeyValue; +import com.youlai.boot.common.model.KeyValue; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/src/main/java/com/youlai/boot/system/service/DeptService.java b/src/main/java/com/youlai/boot/system/service/DeptService.java index 7a9e4793..850a948e 100644 --- a/src/main/java/com/youlai/boot/system/service/DeptService.java +++ b/src/main/java/com/youlai/boot/system/service/DeptService.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.system.model.entity.Dept; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.form.DeptForm; import com.youlai.boot.system.model.query.DeptQuery; import com.youlai.boot.system.model.vo.DeptVO; diff --git a/src/main/java/com/youlai/boot/system/service/DictService.java b/src/main/java/com/youlai/boot/system/service/DictService.java index e8706e58..a064deda 100644 --- a/src/main/java/com/youlai/boot/system/service/DictService.java +++ b/src/main/java/com/youlai/boot/system/service/DictService.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.entity.Dict; import com.youlai.boot.system.model.form.DictForm; import com.youlai.boot.system.model.query.DictQuery; diff --git a/src/main/java/com/youlai/boot/system/service/MenuService.java b/src/main/java/com/youlai/boot/system/service/MenuService.java index 0c8697e9..124e0b5d 100644 --- a/src/main/java/com/youlai/boot/system/service/MenuService.java +++ b/src/main/java/com/youlai/boot/system/service/MenuService.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.module.codegen.model.entity.GenTable; import com.youlai.boot.system.model.form.MenuForm; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.entity.Menu; import com.youlai.boot.system.model.query.MenuQuery; import com.youlai.boot.system.model.vo.MenuVO; diff --git a/src/main/java/com/youlai/boot/system/service/RoleService.java b/src/main/java/com/youlai/boot/system/service/RoleService.java index 5a34d36b..8ade9edc 100644 --- a/src/main/java/com/youlai/boot/system/service/RoleService.java +++ b/src/main/java/com/youlai/boot/system/service/RoleService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.framework.security.model.RoleDataScope; import com.youlai.boot.system.model.entity.Role; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.form.RoleForm; import com.youlai.boot.system.model.query.RoleQuery; import com.youlai.boot.system.model.vo.RolePageVO; diff --git a/src/main/java/com/youlai/boot/system/service/UserService.java b/src/main/java/com/youlai/boot/system/service/UserService.java index 7c932746..d0abf23f 100644 --- a/src/main/java/com/youlai/boot/system/service/UserService.java +++ b/src/main/java/com/youlai/boot/system/service/UserService.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.framework.security.model.UserAuthInfo; import com.youlai.boot.system.model.vo.CurrentUserVO; import com.youlai.boot.system.model.vo.UserExportVO; diff --git a/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java index 5b7504a2..51e06434 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java @@ -13,9 +13,9 @@ import com.youlai.boot.system.model.entity.Dept; import com.youlai.boot.system.model.form.DeptForm; import com.youlai.boot.system.model.query.DeptQuery; import com.youlai.boot.system.model.vo.DeptVO; -import com.youlai.boot.shared.constant.SystemConstants; -import com.youlai.boot.shared.enums.StatusEnum; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.StatusEnum; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.service.DeptService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java index 765851c6..ffc8e06d 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.converter.DictConverter; import com.youlai.boot.system.mapper.DictMapper; import com.youlai.boot.system.model.entity.Dict; diff --git a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java index bc898b1d..9ea413df 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java @@ -16,11 +16,11 @@ import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.system.model.query.MenuQuery; import com.youlai.boot.system.model.vo.MenuVO; import com.youlai.boot.system.model.vo.RouteVO; -import com.youlai.boot.shared.constant.SystemConstants; +import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.system.enums.MenuTypeEnum; -import com.youlai.boot.shared.enums.StatusEnum; -import com.youlai.boot.shared.dto.KeyValue; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.enums.StatusEnum; +import com.youlai.boot.common.model.KeyValue; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.service.MenuService; import com.youlai.boot.system.service.RoleMenuService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java index 5f503536..a981ce7a 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.interfaces.sse.dto.OnlineUserDTO; +import com.youlai.boot.module.sse.dto.OnlineUserDTO; import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.boot.system.converter.NoticeConverter; import com.youlai.boot.system.enums.NoticePublishStatusEnum; @@ -26,7 +26,7 @@ import com.youlai.boot.system.model.query.NoticeQuery; import com.youlai.boot.system.service.NoticeService; import com.youlai.boot.system.service.UserNoticeService; import com.youlai.boot.system.service.UserService; -import com.youlai.boot.interfaces.sse.service.SseService; +import com.youlai.boot.module.sse.service.SseService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java index bb7ce146..de6e5423 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java @@ -8,8 +8,8 @@ import com.youlai.boot.framework.security.token.TokenManager; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.shared.constant.SystemConstants; -import com.youlai.boot.shared.enums.DataScopeEnum; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.DataScopeEnum; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.framework.security.model.RoleDataScope; import com.youlai.boot.system.converter.RoleConverter; @@ -19,7 +19,7 @@ import com.youlai.boot.system.model.entity.RoleMenu; import com.youlai.boot.system.model.form.RoleForm; import com.youlai.boot.system.model.query.RoleQuery; import com.youlai.boot.system.model.vo.RolePageVO; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.boot.system.service.RoleDeptService; import com.youlai.boot.system.service.RoleMenuService; diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index fd0c28cb..708afd26 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.common.constant.RedisConstants; -import com.youlai.boot.shared.constant.SystemConstants; +import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.shared.dto.Option; +import com.youlai.boot.common.model.Option; import com.youlai.boot.framework.integration.mail.service.MailService; import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum; import com.youlai.boot.framework.integration.sms.service.SmsService; diff --git a/src/main/resources/mapper/codegen/DatabaseMapper.xml b/src/main/resources/mapper/codegen/DatabaseMapper.xml index 47684c6b..e94646fc 100644 --- a/src/main/resources/mapper/codegen/DatabaseMapper.xml +++ b/src/main/resources/mapper/codegen/DatabaseMapper.xml @@ -35,7 +35,7 @@ - SELECT TABLE_NAME , TABLE_COMMENT , @@ -50,7 +50,7 @@ - SELECT COLUMN_NAME, DATA_TYPE, diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml index 64e155cf..66eaed93 100644 --- a/src/main/resources/mapper/system/UserMapper.xml +++ b/src/main/resources/mapper/system/UserMapper.xml @@ -34,7 +34,7 @@ INNER JOIN sys_role r ON sur.role_id = r.id WHERE sur.user_id = u.id - AND r.code = '${@com.youlai.boot.shared.constant.SystemConstants@ROOT_ROLE_CODE}' + AND r.code = '${@com.youlai.boot.common.constant.SystemConstants@ROOT_ROLE_CODE}' ) AND ( @@ -186,7 +186,7 @@ INNER JOIN sys_role r ON sur.role_id = r.id WHERE sur.user_id = u.id - AND r.code = '${@com.youlai.boot.shared.constant.SystemConstants@ROOT_ROLE_CODE}' + AND r.code = '${@com.youlai.boot.common.constant.SystemConstants@ROOT_ROLE_CODE}' ) AND (u.username LIKE CONCAT('%',#{keywords},'%') diff --git a/src/test/java/com/youlai/boot/security/token/JwtTokenManagerTest.java b/src/test/java/com/youlai/boot/security/token/JwtTokenManagerTest.java index bea18781..afd1e13d 100644 --- a/src/test/java/com/youlai/boot/security/token/JwtTokenManagerTest.java +++ b/src/test/java/com/youlai/boot/security/token/JwtTokenManagerTest.java @@ -1,6 +1,6 @@ package com.youlai.boot.security.token; -import com.youlai.boot.config.property.SecurityProperties; +import com.youlai.boot.framework.security.config.SecurityProperties; import com.youlai.boot.framework.security.model.AuthenticationToken; import com.youlai.boot.framework.security.model.RoleDataScope; import com.youlai.boot.framework.security.model.SysUserDetails;