From c43e6dfb5471d46c36bed71294424bba0d578ca2 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 14 Oct 2025 16:09:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(platform):=E9=87=8D=E6=9E=84=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=A8=A1=E5=9D=97=E5=8C=85=E7=BB=93=E6=9E=84-=20?= =?UTF-8?q?=E5=B0=86=20shared=20=E5=8C=85=E4=B8=8B=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=A7=BB=E5=8A=A8=E5=88=B0=20platform=20=E5=8C=85?= =?UTF-8?q?=E4=B8=8B=20-=20=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E5=8C=85=E5=BC=95=E7=94=A8=E8=B7=AF=E5=BE=84=20-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20application.yml=20=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8C=85=E6=89=AB=E6=8F=8F=E8=B7=AF=E5=BE=84=20-=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=20CaptchaInfo=20=E7=B1=BB=E4=B8=BA=20Captcha?= =?UTF-8?q?VO=20=E5=B9=B6=E8=B0=83=E6=95=B4=E5=8C=85=E8=B7=AF=E5=BE=84=20-?= =?UTF-8?q?=20=E7=A7=BB=E5=8A=A8=20BusinessException=20=E5=92=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AE=89=E5=85=A8=E7=B1=BB=E5=88=B0=20core=20?= =?UTF-8?q?=E5=8C=85-=20=E6=9B=B4=E6=96=B0=20Codegen=20=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=B1=BB=E5=8C=85=E8=B7=AF=E5=BE=84=20-=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/redis/config/redis.conf | 12 +-- pom.xml | 2 +- .../boot/auth/controller/AuthController.java | 10 +-- .../{CaptchaInfo.java => vo/CaptchaVO.java} | 4 +- .../youlai/boot/auth/service/AuthService.java | 6 +- .../auth/service/impl/AuthServiceImpl.java | 22 ++--- .../enums/CaptchaTypeEnum.java | 0 .../boot/common/util/ResponseUtils.java | 83 ------------------- .../youlai/boot/config/SecurityConfig.java | 21 +++-- .../youlai/boot/config/WebSocketConfig.java | 4 +- .../youlai/boot/core/aspect/LogAspect.java | 2 +- .../boot/core/aspect/RepeatSubmitAspect.java | 2 +- .../exception/BusinessException.java | 2 +- .../exception/GlobalExceptionHandler.java | 4 +- .../boot/core/filter/RateLimiterFilter.java | 6 +- .../result => core/web}/ExcelResult.java | 2 +- .../result => core/web}/IResultCode.java | 2 +- .../result => core/web}/PageResult.java | 2 +- .../{common/result => core/web}/Result.java | 2 +- .../result => core/web}/ResultCode.java | 4 +- .../boot/core/web/WebResponseHelper.java | 75 +++++++++++++++++ .../member/controller/MemberController.java | 10 --- .../module/member/mapper/MemberMapper.java | 10 --- .../boot/module/member/model/Member.java | 10 --- .../module/member/service/MemberService.java | 10 --- .../order/controller/OrderController.java | 10 --- .../boot/module/order/mapper/OrderMapper.java | 10 --- .../youlai/boot/module/order/model/Order.java | 10 --- .../module/order/service/OrderService.java | 10 --- .../product/controller/ProductController.java | 10 --- .../module/product/mapper/ProductMapper.java | 10 --- .../boot/module/product/model/Product.java | 10 --- .../product/service/ProductService.java | 10 --- .../codegen/controller/CodegenController.java | 18 ++-- .../codegen/converter/CodegenConverter.java | 8 +- .../codegen/enums/FormTypeEnum.java | 2 +- .../codegen/enums/JavaTypeEnum.java | 2 +- .../codegen/enums/QueryTypeEnum.java | 2 +- .../codegen/mapper/DatabaseMapper.java | 10 +-- .../codegen/mapper/GenConfigMapper.java | 4 +- .../codegen/mapper/GenFieldConfigMapper.java | 4 +- .../codegen/model/bo/ColumnMetaData.java | 2 +- .../codegen/model/bo/TableMetaData.java | 2 +- .../codegen/model/entity/GenConfig.java | 2 +- .../codegen/model/entity/GenFieldConfig.java | 6 +- .../codegen/model/form/GenConfigForm.java | 6 +- .../codegen/model/query/TablePageQuery.java | 2 +- .../codegen/model/vo/CodegenPreviewVO.java | 2 +- .../codegen/model/vo/TablePageVO.java | 2 +- .../codegen/service/CodegenService.java | 8 +- .../codegen/service/GenConfigService.java | 6 +- .../service/GenFieldConfigService.java | 4 +- .../service/impl/CodegenServiceImpl.java | 25 +++--- .../service/impl/GenConfigServiceImpl.java | 28 +++---- .../impl/GenFieldConfigServiceImpl.java | 8 +- .../file/controller/FileController.java | 8 +- .../file/model/FileInfo.java | 2 +- .../file/service/FileService.java | 4 +- .../file/service/impl/AliyunFileService.java | 6 +- .../file/service/impl/LocalFileService.java | 6 +- .../file/service/impl/MinioFileService.java | 8 +- .../mail/controller/MailController.java | 2 +- .../mail/service/MailService.java | 2 +- .../mail/service/impl/MailServiceImpl.java | 4 +- .../sms/controller/SmsController.java | 2 +- .../sms/enums/SmsTypeEnum.java | 2 +- .../sms/service/SmsService.java | 4 +- .../sms/service/impl/AliyunSmsService.java | 6 +- .../controller/WebsocketController.java | 4 +- .../websocket/model/ChatMessage.java | 2 +- .../knife4j/Knife4jOpenApiCustomizer.java | 0 .../mybatis/MyDataPermissionHandler.java | 2 +- .../mybatis/MyMetaObjectHandler.java | 0 .../exception/CaptchaValidationException.java | 2 +- .../filter/CaptchaValidationFilter.java | 10 +-- .../filter/TokenAuthenticationFilter.java | 12 +-- .../handler}/MyAccessDeniedHandler.java | 8 +- .../handler}/MyAuthenticationEntryPoint.java | 12 +-- .../security/model/AuthenticationToken.java | 2 +- .../{core => }/security/model/OnlineUser.java | 2 +- .../model}/SmsAuthenticationToken.java | 2 +- .../security/model/SysUserDetails.java | 2 +- .../security/model/UserAuthCredentials.java | 2 +- .../WxMiniAppCodeAuthenticationToken.java | 2 +- .../WxMiniAppPhoneAuthenticationToken.java | 2 +- .../provider}/SmsAuthenticationProvider.java | 9 +- .../WxMiniAppCodeAuthenticationProvider.java | 7 +- .../WxMiniAppPhoneAuthenticationProvider.java | 7 +- .../security/service/PermissionService.java | 4 +- .../service/SysUserDetailsService.java | 6 +- .../security/token/JwtTokenManager.java | 8 +- .../security/token/RedisTokenManager.java | 10 +-- .../security/token/TokenManager.java | 4 +- .../security/util/SecurityUtils.java | 4 +- .../system/controller/ConfigController.java | 4 +- .../system/controller/DeptController.java | 2 +- .../system/controller/DictController.java | 4 +- .../boot/system/controller/LogController.java | 4 +- .../system/controller/MenuController.java | 2 +- .../system/controller/NoticeController.java | 4 +- .../system/controller/RoleController.java | 4 +- .../system/controller/UserController.java | 8 +- .../system/listener/UserImportListener.java | 2 +- .../youlai/boot/system/mapper/UserMapper.java | 2 +- .../boot/system/service/MenuService.java | 2 +- .../system/service/UserOnlineService.java | 2 +- .../boot/system/service/UserService.java | 2 +- .../service/impl/ConfigServiceImpl.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 2 +- .../system/service/impl/MenuServiceImpl.java | 4 +- .../service/impl/NoticeServiceImpl.java | 2 +- .../system/service/impl/RoleServiceImpl.java | 2 +- .../service/impl/UserNoticeServiceImpl.java | 2 +- .../service/impl/UserRoleServiceImpl.java | 4 +- .../system/service/impl/UserServiceImpl.java | 14 ++-- src/main/resources/application-dev.yml | 4 +- src/main/resources/application-prod.yml | 4 +- .../mapper/codegen/DatabaseMapper.xml | 8 +- .../mapper/codegen/GenConfigMapper.xml | 2 +- .../mapper/codegen/GenFieldConfigMapper.xml | 2 +- .../resources/mapper/system/UserMapper.xml | 2 +- .../boot/generator/SystemCodeGenerator.java | 4 +- 122 files changed, 346 insertions(+), 475 deletions(-) rename src/main/java/com/youlai/boot/auth/model/{CaptchaInfo.java => vo/CaptchaVO.java} (86%) rename src/main/java/com/youlai/boot/{auth => common}/enums/CaptchaTypeEnum.java (100%) delete mode 100644 src/main/java/com/youlai/boot/common/util/ResponseUtils.java rename src/main/java/com/youlai/boot/{common => core}/exception/BusinessException.java (95%) rename src/main/java/com/youlai/boot/{common => core}/exception/GlobalExceptionHandler.java (99%) rename src/main/java/com/youlai/boot/{common/result => core/web}/ExcelResult.java (94%) rename src/main/java/com/youlai/boot/{common/result => core/web}/IResultCode.java (78%) rename src/main/java/com/youlai/boot/{common/result => core/web}/PageResult.java (95%) rename src/main/java/com/youlai/boot/{common/result => core/web}/Result.java (98%) rename src/main/java/com/youlai/boot/{common/result => core/web}/ResultCode.java (99%) create mode 100644 src/main/java/com/youlai/boot/core/web/WebResponseHelper.java delete mode 100644 src/main/java/com/youlai/boot/module/member/controller/MemberController.java delete mode 100644 src/main/java/com/youlai/boot/module/member/mapper/MemberMapper.java delete mode 100644 src/main/java/com/youlai/boot/module/member/model/Member.java delete mode 100644 src/main/java/com/youlai/boot/module/member/service/MemberService.java delete mode 100644 src/main/java/com/youlai/boot/module/order/controller/OrderController.java delete mode 100644 src/main/java/com/youlai/boot/module/order/mapper/OrderMapper.java delete mode 100644 src/main/java/com/youlai/boot/module/order/model/Order.java delete mode 100644 src/main/java/com/youlai/boot/module/order/service/OrderService.java delete mode 100644 src/main/java/com/youlai/boot/module/product/controller/ProductController.java delete mode 100644 src/main/java/com/youlai/boot/module/product/mapper/ProductMapper.java delete mode 100644 src/main/java/com/youlai/boot/module/product/model/Product.java delete mode 100644 src/main/java/com/youlai/boot/module/product/service/ProductService.java rename src/main/java/com/youlai/boot/{shared => platform}/codegen/controller/CodegenController.java (88%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/converter/CodegenConverter.java (84%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/enums/FormTypeEnum.java (97%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/enums/JavaTypeEnum.java (98%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/enums/QueryTypeEnum.java (96%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/mapper/DatabaseMapper.java (72%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/mapper/GenConfigMapper.java (69%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/mapper/GenFieldConfigMapper.java (69%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/model/bo/ColumnMetaData.java (94%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/model/bo/TableMetaData.java (91%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/model/entity/GenConfig.java (94%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/model/entity/GenFieldConfig.java (90%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/model/form/GenConfigForm.java (94%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/model/query/TablePageQuery.java (91%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/model/vo/CodegenPreviewVO.java (89%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/model/vo/TablePageVO.java (94%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/service/CodegenService.java (74%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/service/GenConfigService.java (78%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/service/GenFieldConfigService.java (63%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/service/impl/CodegenServiceImpl.java (93%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/service/impl/GenConfigServiceImpl.java (90%) rename src/main/java/com/youlai/boot/{shared => platform}/codegen/service/impl/GenFieldConfigServiceImpl.java (60%) rename src/main/java/com/youlai/boot/{shared => platform}/file/controller/FileController.java (88%) rename src/main/java/com/youlai/boot/{shared => platform}/file/model/FileInfo.java (88%) rename src/main/java/com/youlai/boot/{shared => platform}/file/service/FileService.java (82%) rename src/main/java/com/youlai/boot/{shared => platform}/file/service/impl/AliyunFileService.java (95%) rename src/main/java/com/youlai/boot/{shared => platform}/file/service/impl/LocalFileService.java (94%) rename src/main/java/com/youlai/boot/{shared => platform}/file/service/impl/MinioFileService.java (97%) rename src/main/java/com/youlai/boot/{shared => platform}/mail/controller/MailController.java (76%) rename src/main/java/com/youlai/boot/{shared => platform}/mail/service/MailService.java (92%) rename src/main/java/com/youlai/boot/{shared => platform}/mail/service/impl/MailServiceImpl.java (95%) rename src/main/java/com/youlai/boot/{shared => platform}/sms/controller/SmsController.java (66%) rename src/main/java/com/youlai/boot/{shared => platform}/sms/enums/SmsTypeEnum.java (94%) rename src/main/java/com/youlai/boot/{shared => platform}/sms/service/SmsService.java (85%) rename src/main/java/com/youlai/boot/{shared => platform}/sms/service/impl/AliyunSmsService.java (94%) rename src/main/java/com/youlai/boot/{shared => platform}/websocket/controller/WebsocketController.java (94%) rename src/main/java/com/youlai/boot/{shared => platform}/websocket/model/ChatMessage.java (86%) rename src/main/java/com/youlai/boot/{pulgin => plugin}/knife4j/Knife4jOpenApiCustomizer.java (100%) rename src/main/java/com/youlai/boot/{pulgin => plugin}/mybatis/MyDataPermissionHandler.java (98%) rename src/main/java/com/youlai/boot/{pulgin => plugin}/mybatis/MyMetaObjectHandler.java (100%) rename src/main/java/com/youlai/boot/{core => }/security/exception/CaptchaValidationException.java (85%) rename src/main/java/com/youlai/boot/{core => }/security/filter/CaptchaValidationFilter.java (88%) rename src/main/java/com/youlai/boot/{core => }/security/filter/TokenAuthenticationFilter.java (86%) rename src/main/java/com/youlai/boot/{core/security/exception => security/handler}/MyAccessDeniedHandler.java (72%) rename src/main/java/com/youlai/boot/{core/security/exception => security/handler}/MyAuthenticationEntryPoint.java (78%) rename src/main/java/com/youlai/boot/{core => }/security/model/AuthenticationToken.java (93%) rename src/main/java/com/youlai/boot/{core => }/security/model/OnlineUser.java (93%) rename src/main/java/com/youlai/boot/{core/security/extension/sms => security/model}/SmsAuthenticationToken.java (97%) rename src/main/java/com/youlai/boot/{core => }/security/model/SysUserDetails.java (98%) rename src/main/java/com/youlai/boot/{core => }/security/model/UserAuthCredentials.java (94%) rename src/main/java/com/youlai/boot/{core/security/extension/wx => security/model}/WxMiniAppCodeAuthenticationToken.java (97%) rename src/main/java/com/youlai/boot/{core/security/extension/wx => security/model}/WxMiniAppPhoneAuthenticationToken.java (97%) rename src/main/java/com/youlai/boot/{core/security/extension/sms => security/provider}/SmsAuthenticationProvider.java (91%) rename src/main/java/com/youlai/boot/{core/security/extension/wx => security/provider}/WxMiniAppCodeAuthenticationProvider.java (94%) rename src/main/java/com/youlai/boot/{core/security/extension/wx => security/provider}/WxMiniAppPhoneAuthenticationProvider.java (95%) rename src/main/java/com/youlai/boot/{core => }/security/service/PermissionService.java (96%) rename src/main/java/com/youlai/boot/{core => }/security/service/SysUserDetailsService.java (89%) rename src/main/java/com/youlai/boot/{core => }/security/token/JwtTokenManager.java (97%) rename src/main/java/com/youlai/boot/{core => }/security/token/RedisTokenManager.java (97%) rename src/main/java/com/youlai/boot/{core => }/security/token/TokenManager.java (92%) rename src/main/java/com/youlai/boot/{core => }/security/util/SecurityUtils.java (97%) diff --git a/docker/redis/config/redis.conf b/docker/redis/config/redis.conf index 36aaf08e..272c8486 100644 --- a/docker/redis/config/redis.conf +++ b/docker/redis/config/redis.conf @@ -133,7 +133,7 @@ protected-mode no # # enable-protected-configs no # enable-debug-command no -# enable-module-command no +# enable-business-command no # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. @@ -867,7 +867,7 @@ replica-priority 100 # Warning: since Redis is pretty fast, an outside user can try up to # 1 million passwords per second against a modern box. This means that you # should use very strong passwords, otherwise they will be very easy to break. -# Note that because the password is really a shared secret between the client +# Note that because the password is really a platform secret between the client # and the server, and should not be memorized by any human, the password # can be easily a long string from /dev/urandom or whatever, so by using a # long and unguessable password no brute force attack will be possible. @@ -964,7 +964,7 @@ replica-priority 100 # # user alice on +@all -DEBUG ~* >somepassword # -# This will allow "alice" to use all the commands with the exception of the +# This will allow "alice" to use all the commands with the handler of the # DEBUG command, since +@all added all the commands to the set of the commands # alice can use, and later DEBUG was removed. However if we invert the order # of two ACL rules the result will be different: @@ -1066,7 +1066,7 @@ acllog-max-len 128 # create for administrative purposes. # ------------------------------------------------------------------------ # -# It is possible to change the name of dangerous commands in a shared +# It is possible to change the name of dangerous commands in a platform # environment. For instance the CONFIG command may be renamed into something # hard to guess so that it will still be available for internal-use tools # but not available for general clients. @@ -1095,7 +1095,7 @@ acllog-max-len 128 # an error 'max number of clients reached'. # # IMPORTANT: When Redis Cluster is used, the max number of connections is also -# shared with the cluster bus: every node in the cluster will use two +# platform with the cluster bus: every node in the cluster will use two # connections, one incoming and another outgoing. It is important to size the # limit accordingly in case of very large clusters. # @@ -1563,7 +1563,7 @@ aof-timestamp-enabled no # # In this state Redis will only allow a handful of commands to be executed. # For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some -# module specific 'allow-busy' commands. +# business specific 'allow-busy' commands. # # SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not # yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop diff --git a/pom.xml b/pom.xml index 942363b0..ccb0ab4d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.5 + 3.5.6 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 c1f22dad..e4d169fc 100644 --- a/src/main/java/com/youlai/boot/auth/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/auth/controller/AuthController.java @@ -1,13 +1,13 @@ package com.youlai.boot.auth.controller; -import com.youlai.boot.auth.model.CaptchaInfo; +import com.youlai.boot.auth.model.vo.CaptchaVO; import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.common.result.Result; +import com.youlai.boot.core.web.Result; import com.youlai.boot.auth.service.AuthService; import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO; -import com.youlai.boot.core.security.model.AuthenticationToken; import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.security.model.AuthenticationToken; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -34,8 +34,8 @@ public class AuthController { @Operation(summary = "获取验证码") @GetMapping("/captcha") - public Result getCaptcha() { - CaptchaInfo captcha = authService.getCaptcha(); + public Result getCaptcha() { + CaptchaVO captcha = authService.getCaptcha(); return Result.success(captcha); } diff --git a/src/main/java/com/youlai/boot/auth/model/CaptchaInfo.java b/src/main/java/com/youlai/boot/auth/model/vo/CaptchaVO.java similarity index 86% rename from src/main/java/com/youlai/boot/auth/model/CaptchaInfo.java rename to src/main/java/com/youlai/boot/auth/model/vo/CaptchaVO.java index e4095850..3f42c300 100644 --- a/src/main/java/com/youlai/boot/auth/model/CaptchaInfo.java +++ b/src/main/java/com/youlai/boot/auth/model/vo/CaptchaVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.auth.model; +package com.youlai.boot.auth.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; @@ -13,7 +13,7 @@ import lombok.Data; @Schema(description = "验证码信息") @Data @Builder -public class CaptchaInfo { +public class CaptchaVO { @Schema(description = "验证码缓存 Key") private String captchaKey; 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 4bcb411c..5fe2eadf 100644 --- a/src/main/java/com/youlai/boot/auth/service/AuthService.java +++ b/src/main/java/com/youlai/boot/auth/service/AuthService.java @@ -1,8 +1,8 @@ package com.youlai.boot.auth.service; -import com.youlai.boot.auth.model.CaptchaInfo; +import com.youlai.boot.auth.model.vo.CaptchaVO; import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO; -import com.youlai.boot.core.security.model.AuthenticationToken; +import com.youlai.boot.security.model.AuthenticationToken; import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO; /** @@ -32,7 +32,7 @@ public interface AuthService { * * @return 验证码 */ - CaptchaInfo getCaptcha(); + CaptchaVO getCaptcha(); /** * 刷新令牌 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 2e844a6d..61514c7c 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 @@ -6,21 +6,21 @@ import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.youlai.boot.auth.enums.CaptchaTypeEnum; -import com.youlai.boot.auth.model.CaptchaInfo; +import com.youlai.boot.auth.model.vo.CaptchaVO; import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO; import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO; import com.youlai.boot.auth.service.AuthService; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.config.property.CaptchaProperties; -import com.youlai.boot.core.security.extension.sms.SmsAuthenticationToken; -import com.youlai.boot.core.security.extension.wx.WxMiniAppCodeAuthenticationToken; -import com.youlai.boot.core.security.extension.wx.WxMiniAppPhoneAuthenticationToken; -import com.youlai.boot.core.security.model.AuthenticationToken; -import com.youlai.boot.core.security.token.TokenManager; -import com.youlai.boot.core.security.util.SecurityUtils; -import com.youlai.boot.shared.sms.enums.SmsTypeEnum; -import com.youlai.boot.shared.sms.service.SmsService; +import com.youlai.boot.security.model.AuthenticationToken; +import com.youlai.boot.security.model.SmsAuthenticationToken; +import com.youlai.boot.security.model.WxMiniAppCodeAuthenticationToken; +import com.youlai.boot.security.model.WxMiniAppPhoneAuthenticationToken; +import com.youlai.boot.security.token.TokenManager; +import com.youlai.boot.security.util.SecurityUtils; +import com.youlai.boot.platform.sms.enums.SmsTypeEnum; +import com.youlai.boot.platform.sms.service.SmsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; @@ -168,7 +168,7 @@ public class AuthServiceImpl implements AuthService { * @return 验证码 */ @Override - public CaptchaInfo getCaptcha() { + public CaptchaVO getCaptcha() { String captchaType = captchaProperties.getType(); int width = captchaProperties.getWidth(); @@ -204,7 +204,7 @@ public class AuthServiceImpl implements AuthService { TimeUnit.SECONDS ); - return CaptchaInfo.builder() + return CaptchaVO.builder() .captchaKey(captchaKey) .captchaBase64(imageBase64Data) .build(); diff --git a/src/main/java/com/youlai/boot/auth/enums/CaptchaTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/CaptchaTypeEnum.java similarity index 100% rename from src/main/java/com/youlai/boot/auth/enums/CaptchaTypeEnum.java rename to src/main/java/com/youlai/boot/common/enums/CaptchaTypeEnum.java diff --git a/src/main/java/com/youlai/boot/common/util/ResponseUtils.java b/src/main/java/com/youlai/boot/common/util/ResponseUtils.java deleted file mode 100644 index d90804dc..00000000 --- a/src/main/java/com/youlai/boot/common/util/ResponseUtils.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.youlai.boot.common.util; - -import cn.hutool.json.JSONUtil; -import com.youlai.boot.common.result.Result; -import com.youlai.boot.common.result.ResultCode; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; - -import java.io.IOException; -import java.io.PrintWriter; -import java.nio.charset.StandardCharsets; - -/** - * 响应工具类 - * - * @author Ray.Hao - * @since 2.0.0 - */ -@Slf4j -public class ResponseUtils { - - - /** - * 异常消息返回(适用过滤器中处理异常响应) - * - * @param response HttpServletResponse - * @param resultCode 响应结果码 - */ - public static void writeErrMsg(HttpServletResponse response, ResultCode resultCode) { - int status = getHttpStatus(resultCode); - - response.setStatus(status); - response.setContentType(MediaType.APPLICATION_JSON_VALUE); - response.setCharacterEncoding(StandardCharsets.UTF_8.name()); - - try (PrintWriter writer = response.getWriter()) { - String jsonResponse = JSONUtil.toJsonStr(Result.failed(resultCode)); - writer.print(jsonResponse); - writer.flush(); // 确保将响应内容写入到输出流 - } catch (IOException e) { - log.error("响应异常处理失败", e); - } - } - - /** - * 异常消息返回(适用过滤器中处理异常响应) - * - * @param response HttpServletResponse - * @param resultCode 响应结果码 - */ - public static void writeErrMsg(HttpServletResponse response, ResultCode resultCode, String message) { - int status = getHttpStatus(resultCode); - - response.setStatus(status); - response.setContentType(MediaType.APPLICATION_JSON_VALUE); - response.setCharacterEncoding(StandardCharsets.UTF_8.name()); - - try (PrintWriter writer = response.getWriter()) { - String jsonResponse = JSONUtil.toJsonStr(Result.failed(resultCode, message)); - writer.print(jsonResponse); - writer.flush(); // 确保将响应内容写入到输出流 - } catch (IOException e) { - log.error("响应异常处理失败", e); - } - } - - - /** - * 根据结果码获取HTTP状态码 - * - * @param resultCode 结果码 - * @return HTTP状态码 - */ - private static int getHttpStatus(ResultCode resultCode) { - return switch (resultCode) { - case ACCESS_UNAUTHORIZED, ACCESS_TOKEN_INVALID, REFRESH_TOKEN_INVALID -> HttpStatus.UNAUTHORIZED.value(); - default -> HttpStatus.BAD_REQUEST.value(); - }; - } - -} diff --git a/src/main/java/com/youlai/boot/config/SecurityConfig.java b/src/main/java/com/youlai/boot/config/SecurityConfig.java index 6790d4d5..bab3ccaa 100644 --- a/src/main/java/com/youlai/boot/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/config/SecurityConfig.java @@ -5,15 +5,15 @@ import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.ArrayUtil; import com.youlai.boot.config.property.SecurityProperties; import com.youlai.boot.core.filter.RateLimiterFilter; -import com.youlai.boot.core.security.exception.MyAccessDeniedHandler; -import com.youlai.boot.core.security.exception.MyAuthenticationEntryPoint; -import com.youlai.boot.core.security.extension.sms.SmsAuthenticationProvider; -import com.youlai.boot.core.security.extension.wx.WxMiniAppCodeAuthenticationProvider; -import com.youlai.boot.core.security.extension.wx.WxMiniAppPhoneAuthenticationProvider; -import com.youlai.boot.core.security.filter.CaptchaValidationFilter; -import com.youlai.boot.core.security.filter.TokenAuthenticationFilter; -import com.youlai.boot.core.security.token.TokenManager; -import com.youlai.boot.core.security.service.SysUserDetailsService; +import com.youlai.boot.security.filter.CaptchaValidationFilter; +import com.youlai.boot.security.filter.TokenAuthenticationFilter; +import com.youlai.boot.security.handler.MyAccessDeniedHandler; +import com.youlai.boot.security.handler.MyAuthenticationEntryPoint; +import com.youlai.boot.security.provider.SmsAuthenticationProvider; +import com.youlai.boot.security.provider.WxMiniAppCodeAuthenticationProvider; +import com.youlai.boot.security.provider.WxMiniAppPhoneAuthenticationProvider; +import com.youlai.boot.security.token.TokenManager; +import com.youlai.boot.security.service.SysUserDetailsService; import com.youlai.boot.system.service.ConfigService; import com.youlai.boot.system.service.UserService; import lombok.RequiredArgsConstructor; @@ -119,9 +119,8 @@ public class SecurityConfig { */ @Bean public DaoAuthenticationProvider daoAuthenticationProvider() { - DaoAuthenticationProvider daoAuthenticationProvider = new DaoAuthenticationProvider(); + DaoAuthenticationProvider daoAuthenticationProvider = new DaoAuthenticationProvider(userDetailsService); daoAuthenticationProvider.setPasswordEncoder(passwordEncoder); - daoAuthenticationProvider.setUserDetailsService(userDetailsService); return daoAuthenticationProvider; } diff --git a/src/main/java/com/youlai/boot/config/WebSocketConfig.java b/src/main/java/com/youlai/boot/config/WebSocketConfig.java index a344010b..72e2405f 100644 --- a/src/main/java/com/youlai/boot/config/WebSocketConfig.java +++ b/src/main/java/com/youlai/boot/config/WebSocketConfig.java @@ -1,8 +1,8 @@ package com.youlai.boot.config; import cn.hutool.core.util.StrUtil; -import com.youlai.boot.core.security.model.SysUserDetails; -import com.youlai.boot.core.security.token.TokenManager; +import com.youlai.boot.security.model.SysUserDetails; +import com.youlai.boot.security.token.TokenManager; import com.youlai.boot.system.service.WebSocketService; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/youlai/boot/core/aspect/LogAspect.java b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java index 40526ead..4b7ed91b 100644 --- a/src/main/java/com/youlai/boot/core/aspect/LogAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java @@ -10,7 +10,7 @@ import cn.hutool.json.JSONUtil; import com.aliyun.oss.HttpMethod; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.util.IPUtils; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.model.entity.Log; import com.youlai.boot.system.service.LogService; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java b/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java index 7ac704a9..c45766a4 100644 --- a/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SecurityConstants; -import com.youlai.boot.common.result.ResultCode; +import com.youlai.boot.core.web.ResultCode; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.util.IPUtils; diff --git a/src/main/java/com/youlai/boot/common/exception/BusinessException.java b/src/main/java/com/youlai/boot/core/exception/BusinessException.java similarity index 95% rename from src/main/java/com/youlai/boot/common/exception/BusinessException.java rename to src/main/java/com/youlai/boot/core/exception/BusinessException.java index 06467091..d9b2b4cf 100644 --- a/src/main/java/com/youlai/boot/common/exception/BusinessException.java +++ b/src/main/java/com/youlai/boot/core/exception/BusinessException.java @@ -1,6 +1,6 @@ package com.youlai.boot.common.exception; -import com.youlai.boot.common.result.IResultCode; +import com.youlai.boot.core.web.IResultCode; import lombok.Getter; import org.slf4j.helpers.MessageFormatter; diff --git a/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java b/src/main/java/com/youlai/boot/core/exception/GlobalExceptionHandler.java similarity index 99% rename from src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java rename to src/main/java/com/youlai/boot/core/exception/GlobalExceptionHandler.java index 434921a2..9c97f5ad 100644 --- a/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/youlai/boot/core/exception/GlobalExceptionHandler.java @@ -2,8 +2,8 @@ package com.youlai.boot.common.exception; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.core.JsonProcessingException; -import com.youlai.boot.common.result.Result; -import com.youlai.boot.common.result.ResultCode; +import com.youlai.boot.core.web.Result; +import com.youlai.boot.core.web.ResultCode; import jakarta.servlet.ServletException; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; diff --git a/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java b/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java index 166455b1..186175e1 100644 --- a/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java +++ b/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java @@ -4,9 +4,9 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SystemConstants; -import com.youlai.boot.common.result.ResultCode; +import com.youlai.boot.core.web.ResultCode; import com.youlai.boot.common.util.IPUtils; -import com.youlai.boot.common.util.ResponseUtils; +import com.youlai.boot.core.web.WebResponseHelper; import com.youlai.boot.system.service.ConfigService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -88,7 +88,7 @@ public class RateLimiterFilter extends OncePerRequestFilter { // 判断是否限流 if (rateLimit(ip)) { // 返回限流错误信息 - ResponseUtils.writeErrMsg(response, ResultCode.REQUEST_CONCURRENCY_LIMIT_EXCEEDED); + WebResponseHelper.writeError(response, ResultCode.REQUEST_CONCURRENCY_LIMIT_EXCEEDED); return; } diff --git a/src/main/java/com/youlai/boot/common/result/ExcelResult.java b/src/main/java/com/youlai/boot/core/web/ExcelResult.java similarity index 94% rename from src/main/java/com/youlai/boot/common/result/ExcelResult.java rename to src/main/java/com/youlai/boot/core/web/ExcelResult.java index d9d6590a..c73ef6e5 100644 --- a/src/main/java/com/youlai/boot/common/result/ExcelResult.java +++ b/src/main/java/com/youlai/boot/core/web/ExcelResult.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.result; +package com.youlai.boot.core.web; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/common/result/IResultCode.java b/src/main/java/com/youlai/boot/core/web/IResultCode.java similarity index 78% rename from src/main/java/com/youlai/boot/common/result/IResultCode.java rename to src/main/java/com/youlai/boot/core/web/IResultCode.java index 741d604a..0f5930ae 100644 --- a/src/main/java/com/youlai/boot/common/result/IResultCode.java +++ b/src/main/java/com/youlai/boot/core/web/IResultCode.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.result; +package com.youlai.boot.core.web; /** * 响应码接口 diff --git a/src/main/java/com/youlai/boot/common/result/PageResult.java b/src/main/java/com/youlai/boot/core/web/PageResult.java similarity index 95% rename from src/main/java/com/youlai/boot/common/result/PageResult.java rename to src/main/java/com/youlai/boot/core/web/PageResult.java index 693fcb64..16efcaba 100644 --- a/src/main/java/com/youlai/boot/common/result/PageResult.java +++ b/src/main/java/com/youlai/boot/core/web/PageResult.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.result; +package com.youlai.boot.core.web; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/common/result/Result.java b/src/main/java/com/youlai/boot/core/web/Result.java similarity index 98% rename from src/main/java/com/youlai/boot/common/result/Result.java rename to src/main/java/com/youlai/boot/core/web/Result.java index 55fee091..783be757 100644 --- a/src/main/java/com/youlai/boot/common/result/Result.java +++ b/src/main/java/com/youlai/boot/core/web/Result.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.result; +package com.youlai.boot.core.web; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/common/result/ResultCode.java b/src/main/java/com/youlai/boot/core/web/ResultCode.java similarity index 99% rename from src/main/java/com/youlai/boot/common/result/ResultCode.java rename to src/main/java/com/youlai/boot/core/web/ResultCode.java index 2876e6c1..d7ea897b 100644 --- a/src/main/java/com/youlai/boot/common/result/ResultCode.java +++ b/src/main/java/com/youlai/boot/core/web/ResultCode.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.result; +package com.youlai.boot.core.web; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @@ -297,4 +297,4 @@ public enum ResultCode implements IResultCode, Serializable { } return SYSTEM_ERROR; // 默认系统执行错误 } -} \ No newline at end of file +} diff --git a/src/main/java/com/youlai/boot/core/web/WebResponseHelper.java b/src/main/java/com/youlai/boot/core/web/WebResponseHelper.java new file mode 100644 index 00000000..00ad93f2 --- /dev/null +++ b/src/main/java/com/youlai/boot/core/web/WebResponseHelper.java @@ -0,0 +1,75 @@ +package com.youlai.boot.core.web; + +import cn.hutool.extra.servlet.JakartaServletUtil; +import cn.hutool.json.JSONUtil; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; + +/** + * Web响应辅助类 + *

+ * 用于在过滤器、处理器等无法使用 @RestControllerAdvice 的场景中统一处理响应 + * + * @author Ray.Hao + * @since 2.0.0 + */ +@Slf4j +public class WebResponseHelper { + + /** + * 写入错误响应 + * + * @param response HttpServletResponse + * @param resultCode 响应结果码 + */ + public static void writeError(HttpServletResponse response, ResultCode resultCode) { + writeError(response, resultCode, null); + } + + /** + * 写入错误响应（带自定义消息） + * + * @param response HttpServletResponse + * @param resultCode 响应结果码 + * @param message 自定义消息 + */ + public static void writeError(HttpServletResponse response, ResultCode resultCode, String message) { + try { + // 设置HTTP状态码 + int httpStatus = mapHttpStatus(resultCode); + response.setStatus(httpStatus); + + // 构建响应对象 + Result result = message == null + ? Result.failed(resultCode) + : Result.failed(resultCode, message); + + // 写入响应 + JakartaServletUtil.write(response, + JSONUtil.toJsonStr(result), + MediaType.APPLICATION_JSON_VALUE + ); + + } catch (Exception e) { + log.error("写入错误响应失败: resultCode={}, message={}", resultCode, message, e); + } + } + + /** + * 根据业务结果码映射HTTP状态码 + * + * @param resultCode 业务结果码 + * @return HTTP状态码 + */ + private static int mapHttpStatus(ResultCode resultCode) { + return switch (resultCode) { + case ACCESS_UNAUTHORIZED, + ACCESS_TOKEN_INVALID, + REFRESH_TOKEN_INVALID -> HttpStatus.UNAUTHORIZED.value(); + default -> HttpStatus.BAD_REQUEST.value(); + }; + } +} + diff --git a/src/main/java/com/youlai/boot/module/member/controller/MemberController.java b/src/main/java/com/youlai/boot/module/member/controller/MemberController.java deleted file mode 100644 index 63644a5c..00000000 --- a/src/main/java/com/youlai/boot/module/member/controller/MemberController.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.member.controller; - -/** - * 会员控制层-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class MemberController { -} diff --git a/src/main/java/com/youlai/boot/module/member/mapper/MemberMapper.java b/src/main/java/com/youlai/boot/module/member/mapper/MemberMapper.java deleted file mode 100644 index f1b4f548..00000000 --- a/src/main/java/com/youlai/boot/module/member/mapper/MemberMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.member.mapper; - -/** - * 会员数据访问层-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class MemberMapper { -} diff --git a/src/main/java/com/youlai/boot/module/member/model/Member.java b/src/main/java/com/youlai/boot/module/member/model/Member.java deleted file mode 100644 index da5ac12c..00000000 --- a/src/main/java/com/youlai/boot/module/member/model/Member.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.member.model; - -/** - * 会员实体-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class Member { -} diff --git a/src/main/java/com/youlai/boot/module/member/service/MemberService.java b/src/main/java/com/youlai/boot/module/member/service/MemberService.java deleted file mode 100644 index 304602cb..00000000 --- a/src/main/java/com/youlai/boot/module/member/service/MemberService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.member.service; - -/** - * 会员管理服务类-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class MemberService { -} diff --git a/src/main/java/com/youlai/boot/module/order/controller/OrderController.java b/src/main/java/com/youlai/boot/module/order/controller/OrderController.java deleted file mode 100644 index fee9c91c..00000000 --- a/src/main/java/com/youlai/boot/module/order/controller/OrderController.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.order.controller; - -/** - * 订单控制层-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class OrderController { -} diff --git a/src/main/java/com/youlai/boot/module/order/mapper/OrderMapper.java b/src/main/java/com/youlai/boot/module/order/mapper/OrderMapper.java deleted file mode 100644 index c23001f4..00000000 --- a/src/main/java/com/youlai/boot/module/order/mapper/OrderMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.order.mapper; - -/** - * 订单数据访问层-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class OrderMapper { -} diff --git a/src/main/java/com/youlai/boot/module/order/model/Order.java b/src/main/java/com/youlai/boot/module/order/model/Order.java deleted file mode 100644 index 603d2cf8..00000000 --- a/src/main/java/com/youlai/boot/module/order/model/Order.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.order.model; - -/** - * 订单实体-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class Order { -} diff --git a/src/main/java/com/youlai/boot/module/order/service/OrderService.java b/src/main/java/com/youlai/boot/module/order/service/OrderService.java deleted file mode 100644 index 18bc2987..00000000 --- a/src/main/java/com/youlai/boot/module/order/service/OrderService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.order.service; - -/** - * 订单管理服务类-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class OrderService { -} diff --git a/src/main/java/com/youlai/boot/module/product/controller/ProductController.java b/src/main/java/com/youlai/boot/module/product/controller/ProductController.java deleted file mode 100644 index b94b35dc..00000000 --- a/src/main/java/com/youlai/boot/module/product/controller/ProductController.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.product.controller; - -/** - * 商品控制层-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class ProductController { -} diff --git a/src/main/java/com/youlai/boot/module/product/mapper/ProductMapper.java b/src/main/java/com/youlai/boot/module/product/mapper/ProductMapper.java deleted file mode 100644 index db214a5b..00000000 --- a/src/main/java/com/youlai/boot/module/product/mapper/ProductMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.product.mapper; - -/** - * 商品数据访问层-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class ProductMapper { -} diff --git a/src/main/java/com/youlai/boot/module/product/model/Product.java b/src/main/java/com/youlai/boot/module/product/model/Product.java deleted file mode 100644 index a40cb566..00000000 --- a/src/main/java/com/youlai/boot/module/product/model/Product.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.product.model; - -/** - * 商品实体-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class Product { -} diff --git a/src/main/java/com/youlai/boot/module/product/service/ProductService.java b/src/main/java/com/youlai/boot/module/product/service/ProductService.java deleted file mode 100644 index 032225c2..00000000 --- a/src/main/java/com/youlai/boot/module/product/service/ProductService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.youlai.boot.module.product.service; - -/** - * 会员管理服务类-业务模块演示 - * - * @author haoxr - * @since 2024/10/10 - */ -public class ProductService { -} diff --git a/src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java similarity index 88% rename from src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java rename to src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java index 76c57116..497682f4 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java +++ b/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java @@ -1,17 +1,17 @@ -package com.youlai.boot.shared.codegen.controller; +package com.youlai.boot.platform.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.core.web.PageResult; +import com.youlai.boot.core.web.Result; import com.youlai.boot.config.property.CodegenProperties; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.shared.codegen.service.CodegenService; -import com.youlai.boot.shared.codegen.model.form.GenConfigForm; -import com.youlai.boot.shared.codegen.model.query.TablePageQuery; -import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.shared.codegen.model.vo.TablePageVO; +import com.youlai.boot.platform.codegen.service.CodegenService; +import com.youlai.boot.platform.codegen.model.form.GenConfigForm; +import com.youlai.boot.platform.codegen.model.query.TablePageQuery; +import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.platform.codegen.model.vo.TablePageVO; import com.youlai.boot.common.annotation.Log; -import com.youlai.boot.shared.codegen.service.GenConfigService; +import com.youlai.boot.platform.codegen.service.GenConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/youlai/boot/shared/codegen/converter/CodegenConverter.java b/src/main/java/com/youlai/boot/platform/codegen/converter/CodegenConverter.java similarity index 84% rename from src/main/java/com/youlai/boot/shared/codegen/converter/CodegenConverter.java rename to src/main/java/com/youlai/boot/platform/codegen/converter/CodegenConverter.java index 7e33247b..999d5fd1 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/converter/CodegenConverter.java +++ b/src/main/java/com/youlai/boot/platform/codegen/converter/CodegenConverter.java @@ -1,8 +1,8 @@ -package com.youlai.boot.shared.codegen.converter; +package com.youlai.boot.platform.codegen.converter; -import com.youlai.boot.shared.codegen.model.entity.GenConfig; -import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; -import com.youlai.boot.shared.codegen.model.form.GenConfigForm; +import com.youlai.boot.platform.codegen.model.entity.GenConfig; +import com.youlai.boot.platform.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.platform.codegen.model.form.GenConfigForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java b/src/main/java/com/youlai/boot/platform/codegen/enums/FormTypeEnum.java similarity index 97% rename from src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java rename to src/main/java/com/youlai/boot/platform/codegen/enums/FormTypeEnum.java index 255d83f5..34bcbd6e 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/platform/codegen/enums/FormTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.enums; +package com.youlai.boot.platform.codegen.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/boot/shared/codegen/enums/JavaTypeEnum.java b/src/main/java/com/youlai/boot/platform/codegen/enums/JavaTypeEnum.java similarity index 98% rename from src/main/java/com/youlai/boot/shared/codegen/enums/JavaTypeEnum.java rename to src/main/java/com/youlai/boot/platform/codegen/enums/JavaTypeEnum.java index a263d48e..44ea85c6 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/enums/JavaTypeEnum.java +++ b/src/main/java/com/youlai/boot/platform/codegen/enums/JavaTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.enums; +package com.youlai.boot.platform.codegen.enums; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/shared/codegen/enums/QueryTypeEnum.java b/src/main/java/com/youlai/boot/platform/codegen/enums/QueryTypeEnum.java similarity index 96% rename from src/main/java/com/youlai/boot/shared/codegen/enums/QueryTypeEnum.java rename to src/main/java/com/youlai/boot/platform/codegen/enums/QueryTypeEnum.java index cd2d52b4..7c0469d0 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/enums/QueryTypeEnum.java +++ b/src/main/java/com/youlai/boot/platform/codegen/enums/QueryTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.enums; +package com.youlai.boot.platform.codegen.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/boot/shared/codegen/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java similarity index 72% rename from src/main/java/com/youlai/boot/shared/codegen/mapper/DatabaseMapper.java rename to src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java index 1a54cdb2..3d742c63 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java @@ -1,11 +1,11 @@ -package com.youlai.boot.shared.codegen.mapper; +package com.youlai.boot.platform.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.shared.codegen.model.bo.ColumnMetaData; -import com.youlai.boot.shared.codegen.model.bo.TableMetaData; -import com.youlai.boot.shared.codegen.model.query.TablePageQuery; -import com.youlai.boot.shared.codegen.model.vo.TablePageVO; +import com.youlai.boot.platform.codegen.model.bo.ColumnMetaData; +import com.youlai.boot.platform.codegen.model.bo.TableMetaData; +import com.youlai.boot.platform.codegen.model.query.TablePageQuery; +import com.youlai.boot.platform.codegen.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/boot/shared/codegen/mapper/GenConfigMapper.java b/src/main/java/com/youlai/boot/platform/codegen/mapper/GenConfigMapper.java similarity index 69% rename from src/main/java/com/youlai/boot/shared/codegen/mapper/GenConfigMapper.java rename to src/main/java/com/youlai/boot/platform/codegen/mapper/GenConfigMapper.java index a33aa22a..ac3c79af 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/mapper/GenConfigMapper.java +++ b/src/main/java/com/youlai/boot/platform/codegen/mapper/GenConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.shared.codegen.mapper; +package com.youlai.boot.platform.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.shared.codegen.model.entity.GenConfig; +import com.youlai.boot.platform.codegen.model.entity.GenConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/shared/codegen/mapper/GenFieldConfigMapper.java b/src/main/java/com/youlai/boot/platform/codegen/mapper/GenFieldConfigMapper.java similarity index 69% rename from src/main/java/com/youlai/boot/shared/codegen/mapper/GenFieldConfigMapper.java rename to src/main/java/com/youlai/boot/platform/codegen/mapper/GenFieldConfigMapper.java index de54ec3e..14aaf2b1 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/mapper/GenFieldConfigMapper.java +++ b/src/main/java/com/youlai/boot/platform/codegen/mapper/GenFieldConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.shared.codegen.mapper; +package com.youlai.boot.platform.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.platform.codegen.model.entity.GenFieldConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/shared/codegen/model/bo/ColumnMetaData.java b/src/main/java/com/youlai/boot/platform/codegen/model/bo/ColumnMetaData.java similarity index 94% rename from src/main/java/com/youlai/boot/shared/codegen/model/bo/ColumnMetaData.java rename to src/main/java/com/youlai/boot/platform/codegen/model/bo/ColumnMetaData.java index 0bb0e6c0..154947bc 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/model/bo/ColumnMetaData.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/bo/ColumnMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.model.bo; +package com.youlai.boot.platform.codegen.model.bo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/shared/codegen/model/bo/TableMetaData.java b/src/main/java/com/youlai/boot/platform/codegen/model/bo/TableMetaData.java similarity index 91% rename from src/main/java/com/youlai/boot/shared/codegen/model/bo/TableMetaData.java rename to src/main/java/com/youlai/boot/platform/codegen/model/bo/TableMetaData.java index 0f8a18bc..a741ba49 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/model/bo/TableMetaData.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/bo/TableMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.model.bo; +package com.youlai.boot.platform.codegen.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/shared/codegen/model/entity/GenConfig.java b/src/main/java/com/youlai/boot/platform/codegen/model/entity/GenConfig.java similarity index 94% rename from src/main/java/com/youlai/boot/shared/codegen/model/entity/GenConfig.java rename to src/main/java/com/youlai/boot/platform/codegen/model/entity/GenConfig.java index 45df1203..13ad52f7 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/model/entity/GenConfig.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/entity/GenConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.model.entity; +package com.youlai.boot.platform.codegen.model.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/src/main/java/com/youlai/boot/shared/codegen/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/boot/platform/codegen/model/entity/GenFieldConfig.java similarity index 90% rename from src/main/java/com/youlai/boot/shared/codegen/model/entity/GenFieldConfig.java rename to src/main/java/com/youlai/boot/platform/codegen/model/entity/GenFieldConfig.java index 7b8e62e7..7c9bb91f 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/model/entity/GenFieldConfig.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/entity/GenFieldConfig.java @@ -1,12 +1,12 @@ -package com.youlai.boot.shared.codegen.model.entity; +package com.youlai.boot.platform.codegen.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; import com.youlai.boot.common.base.BaseEntity; -import com.youlai.boot.shared.codegen.enums.FormTypeEnum; -import com.youlai.boot.shared.codegen.enums.QueryTypeEnum; +import com.youlai.boot.platform.codegen.enums.FormTypeEnum; +import com.youlai.boot.platform.codegen.enums.QueryTypeEnum; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/shared/codegen/model/form/GenConfigForm.java b/src/main/java/com/youlai/boot/platform/codegen/model/form/GenConfigForm.java similarity index 94% rename from src/main/java/com/youlai/boot/shared/codegen/model/form/GenConfigForm.java rename to src/main/java/com/youlai/boot/platform/codegen/model/form/GenConfigForm.java index 60a6dc03..cf5d22ec 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/form/GenConfigForm.java @@ -1,7 +1,7 @@ -package com.youlai.boot.shared.codegen.model.form; +package com.youlai.boot.platform.codegen.model.form; -import com.youlai.boot.shared.codegen.enums.FormTypeEnum; -import com.youlai.boot.shared.codegen.enums.QueryTypeEnum; +import com.youlai.boot.platform.codegen.enums.FormTypeEnum; +import com.youlai.boot.platform.codegen.enums.QueryTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/shared/codegen/model/query/TablePageQuery.java b/src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java similarity index 91% rename from src/main/java/com/youlai/boot/shared/codegen/model/query/TablePageQuery.java rename to src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java index f44cd8a3..4213560d 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/model/query/TablePageQuery.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.model.query; +package com.youlai.boot.platform.codegen.model.query; import com.fasterxml.jackson.annotation.JsonIgnore; import com.youlai.boot.common.base.BasePageQuery; diff --git a/src/main/java/com/youlai/boot/shared/codegen/model/vo/CodegenPreviewVO.java b/src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java similarity index 89% rename from src/main/java/com/youlai/boot/shared/codegen/model/vo/CodegenPreviewVO.java rename to src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java index 2b8e1a71..749d21bf 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/model/vo/CodegenPreviewVO.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.model.vo; +package com.youlai.boot.platform.codegen.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/shared/codegen/model/vo/TablePageVO.java b/src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java similarity index 94% rename from src/main/java/com/youlai/boot/shared/codegen/model/vo/TablePageVO.java rename to src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java index 30ff28b8..0b011181 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.model.vo; +package com.youlai.boot.platform.codegen.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/CodegenService.java b/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java similarity index 74% rename from src/main/java/com/youlai/boot/shared/codegen/service/CodegenService.java rename to src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java index f42bc765..32c020d1 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/service/CodegenService.java +++ b/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java @@ -1,9 +1,9 @@ -package com.youlai.boot.shared.codegen.service; +package com.youlai.boot.platform.codegen.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.shared.codegen.model.query.TablePageQuery; -import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.shared.codegen.model.vo.TablePageVO; +import com.youlai.boot.platform.codegen.model.query.TablePageQuery; +import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.platform.codegen.model.vo.TablePageVO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/GenConfigService.java b/src/main/java/com/youlai/boot/platform/codegen/service/GenConfigService.java similarity index 78% rename from src/main/java/com/youlai/boot/shared/codegen/service/GenConfigService.java rename to src/main/java/com/youlai/boot/platform/codegen/service/GenConfigService.java index 9b039b2c..2731260e 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/service/GenConfigService.java +++ b/src/main/java/com/youlai/boot/platform/codegen/service/GenConfigService.java @@ -1,8 +1,8 @@ -package com.youlai.boot.shared.codegen.service; +package com.youlai.boot.platform.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.shared.codegen.model.entity.GenConfig; -import com.youlai.boot.shared.codegen.model.form.GenConfigForm; +import com.youlai.boot.platform.codegen.model.entity.GenConfig; +import com.youlai.boot.platform.codegen.model.form.GenConfigForm; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/GenFieldConfigService.java b/src/main/java/com/youlai/boot/platform/codegen/service/GenFieldConfigService.java similarity index 63% rename from src/main/java/com/youlai/boot/shared/codegen/service/GenFieldConfigService.java rename to src/main/java/com/youlai/boot/platform/codegen/service/GenFieldConfigService.java index 5433da03..fbfda4d4 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/service/GenFieldConfigService.java +++ b/src/main/java/com/youlai/boot/platform/codegen/service/GenFieldConfigService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.shared.codegen.service; +package com.youlai.boot.platform.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.platform.codegen.model.entity.GenFieldConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java rename to src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java index 8e568714..6d8c91ec 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.service.impl; +package com.youlai.boot.platform.codegen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; @@ -11,18 +11,18 @@ import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.shared.codegen.enums.JavaTypeEnum; +import com.youlai.boot.platform.codegen.enums.JavaTypeEnum; import com.youlai.boot.config.property.CodegenProperties; -import com.youlai.boot.shared.codegen.service.GenConfigService; -import com.youlai.boot.shared.codegen.service.GenFieldConfigService; -import com.youlai.boot.shared.codegen.service.CodegenService; +import com.youlai.boot.platform.codegen.service.GenConfigService; +import com.youlai.boot.platform.codegen.service.GenFieldConfigService; +import com.youlai.boot.platform.codegen.service.CodegenService; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.shared.codegen.mapper.DatabaseMapper; -import com.youlai.boot.shared.codegen.model.entity.GenConfig; -import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; -import com.youlai.boot.shared.codegen.model.query.TablePageQuery; -import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.shared.codegen.model.vo.TablePageVO; +import com.youlai.boot.platform.codegen.mapper.DatabaseMapper; +import com.youlai.boot.platform.codegen.model.entity.GenConfig; +import com.youlai.boot.platform.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.platform.codegen.model.query.TablePageQuery; +import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.platform.codegen.model.vo.TablePageVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -258,9 +258,6 @@ public class CodegenServiceImpl implements CodegenService { TemplateEngine templateEngine = TemplateUtil.createEngine(new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH)); // 根据 ui 选择不同的前端页面模板：默认 index.vue.vm；封装版使用 index.curd.vue.vm String path = templateConfig.getTemplatePath(); - if ("VIEW".equals(FileNameUtil.mainName(path))) { - // 无法通过文件名区分时，依据子包名与扩展名判断 - } if ("curd".equalsIgnoreCase(pageType) && path.endsWith("index.vue.vm")) { path = path.replace("index.vue.vm", "index.curd.vue.vm"); } diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java b/src/main/java/com/youlai/boot/platform/codegen/service/impl/GenConfigServiceImpl.java similarity index 90% rename from src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java rename to src/main/java/com/youlai/boot/platform/codegen/service/impl/GenConfigServiceImpl.java index 143f6372..fe4cb49d 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/codegen/service/impl/GenConfigServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.codegen.service.impl; +package com.youlai.boot.platform.codegen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -7,21 +7,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.YouLaiBootApplication; import com.youlai.boot.common.enums.EnvEnum; -import com.youlai.boot.shared.codegen.enums.FormTypeEnum; -import com.youlai.boot.shared.codegen.enums.JavaTypeEnum; -import com.youlai.boot.shared.codegen.enums.QueryTypeEnum; +import com.youlai.boot.platform.codegen.enums.FormTypeEnum; +import com.youlai.boot.platform.codegen.enums.JavaTypeEnum; +import com.youlai.boot.platform.codegen.enums.QueryTypeEnum; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.config.property.CodegenProperties; -import com.youlai.boot.shared.codegen.converter.CodegenConverter; -import com.youlai.boot.shared.codegen.mapper.DatabaseMapper; -import com.youlai.boot.shared.codegen.mapper.GenConfigMapper; -import com.youlai.boot.shared.codegen.model.bo.ColumnMetaData; -import com.youlai.boot.shared.codegen.model.bo.TableMetaData; -import com.youlai.boot.shared.codegen.model.entity.GenConfig; -import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; -import com.youlai.boot.shared.codegen.model.form.GenConfigForm; -import com.youlai.boot.shared.codegen.service.GenConfigService; -import com.youlai.boot.shared.codegen.service.GenFieldConfigService; +import com.youlai.boot.platform.codegen.converter.CodegenConverter; +import com.youlai.boot.platform.codegen.mapper.DatabaseMapper; +import com.youlai.boot.platform.codegen.mapper.GenConfigMapper; +import com.youlai.boot.platform.codegen.model.bo.ColumnMetaData; +import com.youlai.boot.platform.codegen.model.bo.TableMetaData; +import com.youlai.boot.platform.codegen.model.entity.GenConfig; +import com.youlai.boot.platform.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.platform.codegen.model.form.GenConfigForm; +import com.youlai.boot.platform.codegen.service.GenConfigService; +import com.youlai.boot.platform.codegen.service.GenFieldConfigService; import com.youlai.boot.system.service.MenuService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenFieldConfigServiceImpl.java b/src/main/java/com/youlai/boot/platform/codegen/service/impl/GenFieldConfigServiceImpl.java similarity index 60% rename from src/main/java/com/youlai/boot/shared/codegen/service/impl/GenFieldConfigServiceImpl.java rename to src/main/java/com/youlai/boot/platform/codegen/service/impl/GenFieldConfigServiceImpl.java index 948711e5..e6dd938b 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenFieldConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/codegen/service/impl/GenFieldConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.boot.shared.codegen.service.impl; +package com.youlai.boot.platform.codegen.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.shared.codegen.mapper.GenFieldConfigMapper; -import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; -import com.youlai.boot.shared.codegen.service.GenFieldConfigService; +import com.youlai.boot.platform.codegen.mapper.GenFieldConfigMapper; +import com.youlai.boot.platform.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.platform.codegen.service.GenFieldConfigService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/shared/file/controller/FileController.java b/src/main/java/com/youlai/boot/platform/file/controller/FileController.java similarity index 88% rename from src/main/java/com/youlai/boot/shared/file/controller/FileController.java rename to src/main/java/com/youlai/boot/platform/file/controller/FileController.java index b07a9c21..a6b63feb 100644 --- a/src/main/java/com/youlai/boot/shared/file/controller/FileController.java +++ b/src/main/java/com/youlai/boot/platform/file/controller/FileController.java @@ -1,8 +1,8 @@ -package com.youlai.boot.shared.file.controller; +package com.youlai.boot.platform.file.controller; -import com.youlai.boot.common.result.Result; -import com.youlai.boot.shared.file.service.FileService; -import com.youlai.boot.shared.file.model.FileInfo; +import com.youlai.boot.core.web.Result; +import com.youlai.boot.platform.file.service.FileService; +import com.youlai.boot.platform.file.model.FileInfo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/shared/file/model/FileInfo.java b/src/main/java/com/youlai/boot/platform/file/model/FileInfo.java similarity index 88% rename from src/main/java/com/youlai/boot/shared/file/model/FileInfo.java rename to src/main/java/com/youlai/boot/platform/file/model/FileInfo.java index ec550a18..b50acc51 100644 --- a/src/main/java/com/youlai/boot/shared/file/model/FileInfo.java +++ b/src/main/java/com/youlai/boot/platform/file/model/FileInfo.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.file.model; +package com.youlai.boot.platform.file.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/shared/file/service/FileService.java b/src/main/java/com/youlai/boot/platform/file/service/FileService.java similarity index 82% rename from src/main/java/com/youlai/boot/shared/file/service/FileService.java rename to src/main/java/com/youlai/boot/platform/file/service/FileService.java index 42bce9b4..501abfdc 100644 --- a/src/main/java/com/youlai/boot/shared/file/service/FileService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/FileService.java @@ -1,6 +1,6 @@ -package com.youlai.boot.shared.file.service; +package com.youlai.boot.platform.file.service; -import com.youlai.boot.shared.file.model.FileInfo; +import com.youlai.boot.platform.file.model.FileInfo; import org.springframework.web.multipart.MultipartFile; /** diff --git a/src/main/java/com/youlai/boot/shared/file/service/impl/AliyunFileService.java b/src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java similarity index 95% rename from src/main/java/com/youlai/boot/shared/file/service/impl/AliyunFileService.java rename to src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java index 004475fd..4831cbc1 100644 --- a/src/main/java/com/youlai/boot/shared/file/service/impl/AliyunFileService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.file.service.impl; +package com.youlai.boot.platform.file.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -8,8 +8,8 @@ import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; -import com.youlai.boot.shared.file.service.FileService; -import com.youlai.boot.shared.file.model.FileInfo; +import com.youlai.boot.platform.file.service.FileService; +import com.youlai.boot.platform.file.model.FileInfo; import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/shared/file/service/impl/LocalFileService.java b/src/main/java/com/youlai/boot/platform/file/service/impl/LocalFileService.java similarity index 94% rename from src/main/java/com/youlai/boot/shared/file/service/impl/LocalFileService.java rename to src/main/java/com/youlai/boot/platform/file/service/impl/LocalFileService.java index 5cd0b97f..15fb9761 100644 --- a/src/main/java/com/youlai/boot/shared/file/service/impl/LocalFileService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/impl/LocalFileService.java @@ -1,11 +1,11 @@ -package com.youlai.boot.shared.file.service.impl; +package com.youlai.boot.platform.file.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; -import com.youlai.boot.shared.file.model.FileInfo; -import com.youlai.boot.shared.file.service.FileService; +import com.youlai.boot.platform.file.model.FileInfo; +import com.youlai.boot.platform.file.service.FileService; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/shared/file/service/impl/MinioFileService.java b/src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java similarity index 97% rename from src/main/java/com/youlai/boot/shared/file/service/impl/MinioFileService.java rename to src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java index 030ff1aa..367a6c8f 100644 --- a/src/main/java/com/youlai/boot/shared/file/service/impl/MinioFileService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.file.service.impl; +package com.youlai.boot.platform.file.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -6,9 +6,9 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.shared.file.model.FileInfo; -import com.youlai.boot.shared.file.service.FileService; +import com.youlai.boot.core.web.ResultCode; +import com.youlai.boot.platform.file.model.FileInfo; +import com.youlai.boot.platform.file.service.FileService; import io.minio.*; import io.minio.http.Method; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/youlai/boot/shared/mail/controller/MailController.java b/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java similarity index 76% rename from src/main/java/com/youlai/boot/shared/mail/controller/MailController.java rename to src/main/java/com/youlai/boot/platform/mail/controller/MailController.java index d9e4c20d..f31c127b 100644 --- a/src/main/java/com/youlai/boot/shared/mail/controller/MailController.java +++ b/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.mail.controller; +package com.youlai.boot.platform.mail.controller; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/youlai/boot/shared/mail/service/MailService.java b/src/main/java/com/youlai/boot/platform/mail/service/MailService.java similarity index 92% rename from src/main/java/com/youlai/boot/shared/mail/service/MailService.java rename to src/main/java/com/youlai/boot/platform/mail/service/MailService.java index 60f4d827..f1304cfd 100644 --- a/src/main/java/com/youlai/boot/shared/mail/service/MailService.java +++ b/src/main/java/com/youlai/boot/platform/mail/service/MailService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.mail.service; +package com.youlai.boot.platform.mail.service; /** * 邮件服务接口层 diff --git a/src/main/java/com/youlai/boot/shared/mail/service/impl/MailServiceImpl.java b/src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/boot/shared/mail/service/impl/MailServiceImpl.java rename to src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java index 2373401c..9ffc74b7 100644 --- a/src/main/java/com/youlai/boot/shared/mail/service/impl/MailServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java @@ -1,7 +1,7 @@ -package com.youlai.boot.shared.mail.service.impl; +package com.youlai.boot.platform.mail.service.impl; import com.youlai.boot.config.property.MailProperties; -import com.youlai.boot.shared.mail.service.MailService; +import com.youlai.boot.platform.mail.service.MailService; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/shared/sms/controller/SmsController.java b/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java similarity index 66% rename from src/main/java/com/youlai/boot/shared/sms/controller/SmsController.java rename to src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java index 710601bc..c88b3f29 100644 --- a/src/main/java/com/youlai/boot/shared/sms/controller/SmsController.java +++ b/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.sms.controller; +package com.youlai.boot.platform.sms.controller; /** * 短信控制层 diff --git a/src/main/java/com/youlai/boot/shared/sms/enums/SmsTypeEnum.java b/src/main/java/com/youlai/boot/platform/sms/enums/SmsTypeEnum.java similarity index 94% rename from src/main/java/com/youlai/boot/shared/sms/enums/SmsTypeEnum.java rename to src/main/java/com/youlai/boot/platform/sms/enums/SmsTypeEnum.java index b852a797..ceede8a8 100644 --- a/src/main/java/com/youlai/boot/shared/sms/enums/SmsTypeEnum.java +++ b/src/main/java/com/youlai/boot/platform/sms/enums/SmsTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.sms.enums; +package com.youlai.boot.platform.sms.enums; import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/shared/sms/service/SmsService.java b/src/main/java/com/youlai/boot/platform/sms/service/SmsService.java similarity index 85% rename from src/main/java/com/youlai/boot/shared/sms/service/SmsService.java rename to src/main/java/com/youlai/boot/platform/sms/service/SmsService.java index 3deb1157..d4097353 100644 --- a/src/main/java/com/youlai/boot/shared/sms/service/SmsService.java +++ b/src/main/java/com/youlai/boot/platform/sms/service/SmsService.java @@ -1,6 +1,6 @@ -package com.youlai.boot.shared.sms.service; +package com.youlai.boot.platform.sms.service; -import com.youlai.boot.shared.sms.enums.SmsTypeEnum; +import com.youlai.boot.platform.sms.enums.SmsTypeEnum; import java.util.Map; diff --git a/src/main/java/com/youlai/boot/shared/sms/service/impl/AliyunSmsService.java b/src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java similarity index 94% rename from src/main/java/com/youlai/boot/shared/sms/service/impl/AliyunSmsService.java rename to src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java index b37ed844..a9adac40 100644 --- a/src/main/java/com/youlai/boot/shared/sms/service/impl/AliyunSmsService.java +++ b/src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.sms.service.impl; +package com.youlai.boot.platform.sms.service.impl; import cn.hutool.json.JSONUtil; import com.aliyuncs.CommonRequest; @@ -9,8 +9,8 @@ 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.shared.sms.enums.SmsTypeEnum; -import com.youlai.boot.shared.sms.service.SmsService; +import com.youlai.boot.platform.sms.enums.SmsTypeEnum; +import com.youlai.boot.platform.sms.service.SmsService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/shared/websocket/controller/WebsocketController.java b/src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java similarity index 94% rename from src/main/java/com/youlai/boot/shared/websocket/controller/WebsocketController.java rename to src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java index 610a2455..0a9f8966 100644 --- a/src/main/java/com/youlai/boot/shared/websocket/controller/WebsocketController.java +++ b/src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java @@ -1,6 +1,6 @@ -package com.youlai.boot.shared.websocket.controller; +package com.youlai.boot.platform.websocket.controller; -import com.youlai.boot.shared.websocket.model.ChatMessage; +import com.youlai.boot.platform.websocket.model.ChatMessage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.handler.annotation.DestinationVariable; diff --git a/src/main/java/com/youlai/boot/shared/websocket/model/ChatMessage.java b/src/main/java/com/youlai/boot/platform/websocket/model/ChatMessage.java similarity index 86% rename from src/main/java/com/youlai/boot/shared/websocket/model/ChatMessage.java rename to src/main/java/com/youlai/boot/platform/websocket/model/ChatMessage.java index dff4ffac..a94b0b11 100644 --- a/src/main/java/com/youlai/boot/shared/websocket/model/ChatMessage.java +++ b/src/main/java/com/youlai/boot/platform/websocket/model/ChatMessage.java @@ -1,4 +1,4 @@ -package com.youlai.boot.shared.websocket.model; +package com.youlai.boot.platform.websocket.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/pulgin/knife4j/Knife4jOpenApiCustomizer.java b/src/main/java/com/youlai/boot/plugin/knife4j/Knife4jOpenApiCustomizer.java similarity index 100% rename from src/main/java/com/youlai/boot/pulgin/knife4j/Knife4jOpenApiCustomizer.java rename to src/main/java/com/youlai/boot/plugin/knife4j/Knife4jOpenApiCustomizer.java diff --git a/src/main/java/com/youlai/boot/pulgin/mybatis/MyDataPermissionHandler.java b/src/main/java/com/youlai/boot/plugin/mybatis/MyDataPermissionHandler.java similarity index 98% rename from src/main/java/com/youlai/boot/pulgin/mybatis/MyDataPermissionHandler.java rename to src/main/java/com/youlai/boot/plugin/mybatis/MyDataPermissionHandler.java index aa98f34e..e7ff2ff8 100644 --- a/src/main/java/com/youlai/boot/pulgin/mybatis/MyDataPermissionHandler.java +++ b/src/main/java/com/youlai/boot/plugin/mybatis/MyDataPermissionHandler.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; import com.youlai.boot.common.annotation.DataPermission; import com.youlai.boot.common.base.IBaseEnum; import com.youlai.boot.common.enums.DataScopeEnum; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; diff --git a/src/main/java/com/youlai/boot/pulgin/mybatis/MyMetaObjectHandler.java b/src/main/java/com/youlai/boot/plugin/mybatis/MyMetaObjectHandler.java similarity index 100% rename from src/main/java/com/youlai/boot/pulgin/mybatis/MyMetaObjectHandler.java rename to src/main/java/com/youlai/boot/plugin/mybatis/MyMetaObjectHandler.java diff --git a/src/main/java/com/youlai/boot/core/security/exception/CaptchaValidationException.java b/src/main/java/com/youlai/boot/security/exception/CaptchaValidationException.java similarity index 85% rename from src/main/java/com/youlai/boot/core/security/exception/CaptchaValidationException.java rename to src/main/java/com/youlai/boot/security/exception/CaptchaValidationException.java index 7b498a1a..5232f01c 100644 --- a/src/main/java/com/youlai/boot/core/security/exception/CaptchaValidationException.java +++ b/src/main/java/com/youlai/boot/security/exception/CaptchaValidationException.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.exception; +package com.youlai.boot.core.exception; import org.springframework.security.core.AuthenticationException; diff --git a/src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java b/src/main/java/com/youlai/boot/security/filter/CaptchaValidationFilter.java similarity index 88% rename from src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java rename to src/main/java/com/youlai/boot/security/filter/CaptchaValidationFilter.java index 8589a6e0..771a7555 100644 --- a/src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java +++ b/src/main/java/com/youlai/boot/security/filter/CaptchaValidationFilter.java @@ -1,11 +1,11 @@ -package com.youlai.boot.core.security.filter; +package com.youlai.boot.security.filter; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SecurityConstants; -import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.common.util.ResponseUtils; +import com.youlai.boot.core.web.ResultCode; +import com.youlai.boot.core.web.WebResponseHelper; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -58,13 +58,13 @@ public class CaptchaValidationFilter extends OncePerRequestFilter { StrUtil.format(RedisConstants.Captcha.IMAGE_CODE, verifyCodeKey) ); if (cacheVerifyCode == null) { - ResponseUtils.writeErrMsg(response, ResultCode.USER_VERIFICATION_CODE_EXPIRED); + WebResponseHelper.writeError(response, ResultCode.USER_VERIFICATION_CODE_EXPIRED); } else { // 验证码比对 if (codeGenerator.verify(cacheVerifyCode, captchaCode)) { chain.doFilter(request, response); } else { - ResponseUtils.writeErrMsg(response, ResultCode.USER_VERIFICATION_CODE_ERROR); + WebResponseHelper.writeError(response, ResultCode.USER_VERIFICATION_CODE_ERROR); } } } else { diff --git a/src/main/java/com/youlai/boot/core/security/filter/TokenAuthenticationFilter.java b/src/main/java/com/youlai/boot/security/filter/TokenAuthenticationFilter.java similarity index 86% rename from src/main/java/com/youlai/boot/core/security/filter/TokenAuthenticationFilter.java rename to src/main/java/com/youlai/boot/security/filter/TokenAuthenticationFilter.java index b71e86ce..91712520 100644 --- a/src/main/java/com/youlai/boot/core/security/filter/TokenAuthenticationFilter.java +++ b/src/main/java/com/youlai/boot/security/filter/TokenAuthenticationFilter.java @@ -1,10 +1,10 @@ -package com.youlai.boot.core.security.filter; +package com.youlai.boot.security.filter; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.SecurityConstants; -import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.common.util.ResponseUtils; -import com.youlai.boot.core.security.token.TokenManager; +import com.youlai.boot.core.web.ResultCode; +import com.youlai.boot.core.web.WebResponseHelper; +import com.youlai.boot.security.token.TokenManager; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -52,7 +52,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { // 执行令牌有效性检查（包含密码学验签和过期时间验证） boolean isValidToken = tokenManager.validateToken(rawToken); if (!isValidToken) { - ResponseUtils.writeErrMsg(response, ResultCode.ACCESS_TOKEN_INVALID); + WebResponseHelper.writeError(response, ResultCode.ACCESS_TOKEN_INVALID); return; } @@ -63,7 +63,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { } catch (Exception ex) { // 安全上下文清除保障（防止上下文残留） SecurityContextHolder.clearContext(); - ResponseUtils.writeErrMsg(response, ResultCode.ACCESS_TOKEN_INVALID); + WebResponseHelper.writeError(response, ResultCode.ACCESS_TOKEN_INVALID); return; } diff --git a/src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/boot/security/handler/MyAccessDeniedHandler.java similarity index 72% rename from src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java rename to src/main/java/com/youlai/boot/security/handler/MyAccessDeniedHandler.java index 5efbfbff..e1e2a861 100644 --- a/src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java +++ b/src/main/java/com/youlai/boot/security/handler/MyAccessDeniedHandler.java @@ -1,7 +1,7 @@ -package com.youlai.boot.core.security.exception; +package com.youlai.boot.security.handler; -import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.common.util.ResponseUtils; +import com.youlai.boot.core.web.ResultCode; +import com.youlai.boot.core.web.WebResponseHelper; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; @@ -20,7 +20,7 @@ public class MyAccessDeniedHandler implements AccessDeniedHandler { @Override public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) { - ResponseUtils.writeErrMsg(response, ResultCode.ACCESS_UNAUTHORIZED); + WebResponseHelper.writeError(response, ResultCode.ACCESS_UNAUTHORIZED); } } diff --git a/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/boot/security/handler/MyAuthenticationEntryPoint.java similarity index 78% rename from src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java rename to src/main/java/com/youlai/boot/security/handler/MyAuthenticationEntryPoint.java index ff5f041e..09d0780c 100644 --- a/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/boot/security/handler/MyAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ -package com.youlai.boot.core.security.exception; +package com.youlai.boot.security.handler; -import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.common.util.ResponseUtils; +import com.youlai.boot.core.web.ResultCode; +import com.youlai.boot.core.web.WebResponseHelper; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.InsufficientAuthenticationException; import org.springframework.security.core.AuthenticationException; @@ -32,13 +32,13 @@ public class MyAuthenticationEntryPoint implements AuthenticationEntryPoint { public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { if (authException instanceof BadCredentialsException) { // 用户名或密码错误 - ResponseUtils.writeErrMsg(response, ResultCode.USER_PASSWORD_ERROR); + WebResponseHelper.writeError(response, ResultCode.USER_PASSWORD_ERROR); } else if(authException instanceof InsufficientAuthenticationException){ // 请求头缺失Authorization、Token格式错误、Token过期、签名验证失败 - ResponseUtils.writeErrMsg(response, ResultCode.ACCESS_TOKEN_INVALID); + WebResponseHelper.writeError(response, ResultCode.ACCESS_TOKEN_INVALID); } else { // 其他未明确处理的认证异常（如账户被锁定、账户禁用等） - ResponseUtils.writeErrMsg(response, ResultCode.USER_LOGIN_EXCEPTION, authException.getMessage()); + WebResponseHelper.writeError(response, ResultCode.USER_LOGIN_EXCEPTION, authException.getMessage()); } } } diff --git a/src/main/java/com/youlai/boot/core/security/model/AuthenticationToken.java b/src/main/java/com/youlai/boot/security/model/AuthenticationToken.java similarity index 93% rename from src/main/java/com/youlai/boot/core/security/model/AuthenticationToken.java rename to src/main/java/com/youlai/boot/security/model/AuthenticationToken.java index aaa352dd..43ca5cb2 100644 --- a/src/main/java/com/youlai/boot/core/security/model/AuthenticationToken.java +++ b/src/main/java/com/youlai/boot/security/model/AuthenticationToken.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.model; +package com.youlai.boot.security.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/youlai/boot/core/security/model/OnlineUser.java b/src/main/java/com/youlai/boot/security/model/OnlineUser.java similarity index 93% rename from src/main/java/com/youlai/boot/core/security/model/OnlineUser.java rename to src/main/java/com/youlai/boot/security/model/OnlineUser.java index 095a2912..6dd72608 100644 --- a/src/main/java/com/youlai/boot/core/security/model/OnlineUser.java +++ b/src/main/java/com/youlai/boot/security/model/OnlineUser.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.model; +package com.youlai.boot.security.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/core/security/extension/sms/SmsAuthenticationToken.java b/src/main/java/com/youlai/boot/security/model/SmsAuthenticationToken.java similarity index 97% rename from src/main/java/com/youlai/boot/core/security/extension/sms/SmsAuthenticationToken.java rename to src/main/java/com/youlai/boot/security/model/SmsAuthenticationToken.java index 54cb026c..d2aec807 100644 --- a/src/main/java/com/youlai/boot/core/security/extension/sms/SmsAuthenticationToken.java +++ b/src/main/java/com/youlai/boot/security/model/SmsAuthenticationToken.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.extension.sms; +package com.youlai.boot.security.model; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java b/src/main/java/com/youlai/boot/security/model/SysUserDetails.java similarity index 98% rename from src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java rename to src/main/java/com/youlai/boot/security/model/SysUserDetails.java index 4037bc8c..8a79831c 100644 --- a/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java +++ b/src/main/java/com/youlai/boot/security/model/SysUserDetails.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.model; +package com.youlai.boot.security.model; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/com/youlai/boot/core/security/model/UserAuthCredentials.java b/src/main/java/com/youlai/boot/security/model/UserAuthCredentials.java similarity index 94% rename from src/main/java/com/youlai/boot/core/security/model/UserAuthCredentials.java rename to src/main/java/com/youlai/boot/security/model/UserAuthCredentials.java index aa064ee2..e68d119d 100644 --- a/src/main/java/com/youlai/boot/core/security/model/UserAuthCredentials.java +++ b/src/main/java/com/youlai/boot/security/model/UserAuthCredentials.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.model; +package com.youlai.boot.security.model; import lombok.Data; import java.util.Set; diff --git a/src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppCodeAuthenticationToken.java b/src/main/java/com/youlai/boot/security/model/WxMiniAppCodeAuthenticationToken.java similarity index 97% rename from src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppCodeAuthenticationToken.java rename to src/main/java/com/youlai/boot/security/model/WxMiniAppCodeAuthenticationToken.java index 6ae8dce1..675e9db6 100644 --- a/src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppCodeAuthenticationToken.java +++ b/src/main/java/com/youlai/boot/security/model/WxMiniAppCodeAuthenticationToken.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.extension.wx; +package com.youlai.boot.security.model; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppPhoneAuthenticationToken.java b/src/main/java/com/youlai/boot/security/model/WxMiniAppPhoneAuthenticationToken.java similarity index 97% rename from src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppPhoneAuthenticationToken.java rename to src/main/java/com/youlai/boot/security/model/WxMiniAppPhoneAuthenticationToken.java index 5df01228..697e8941 100644 --- a/src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppPhoneAuthenticationToken.java +++ b/src/main/java/com/youlai/boot/security/model/WxMiniAppPhoneAuthenticationToken.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.extension.wx; +package com.youlai.boot.security.model; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/youlai/boot/core/security/extension/sms/SmsAuthenticationProvider.java b/src/main/java/com/youlai/boot/security/provider/SmsAuthenticationProvider.java similarity index 91% rename from src/main/java/com/youlai/boot/core/security/extension/sms/SmsAuthenticationProvider.java rename to src/main/java/com/youlai/boot/security/provider/SmsAuthenticationProvider.java index 74c98cda..9c6b2a85 100644 --- a/src/main/java/com/youlai/boot/core/security/extension/sms/SmsAuthenticationProvider.java +++ b/src/main/java/com/youlai/boot/security/provider/SmsAuthenticationProvider.java @@ -1,11 +1,12 @@ -package com.youlai.boot.core.security.extension.sms; +package com.youlai.boot.security.provider; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.RedisConstants; -import com.youlai.boot.core.security.exception.CaptchaValidationException; -import com.youlai.boot.core.security.model.SysUserDetails; -import com.youlai.boot.core.security.model.UserAuthCredentials; +import com.youlai.boot.core.exception.CaptchaValidationException; +import com.youlai.boot.security.model.SmsAuthenticationToken; +import com.youlai.boot.security.model.SysUserDetails; +import com.youlai.boot.security.model.UserAuthCredentials; import com.youlai.boot.system.service.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppCodeAuthenticationProvider.java b/src/main/java/com/youlai/boot/security/provider/WxMiniAppCodeAuthenticationProvider.java similarity index 94% rename from src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppCodeAuthenticationProvider.java rename to src/main/java/com/youlai/boot/security/provider/WxMiniAppCodeAuthenticationProvider.java index 94a53874..3214df81 100644 --- a/src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppCodeAuthenticationProvider.java +++ b/src/main/java/com/youlai/boot/security/provider/WxMiniAppCodeAuthenticationProvider.java @@ -1,11 +1,12 @@ -package com.youlai.boot.core.security.extension.wx; +package com.youlai.boot.security.provider; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.boot.core.security.model.SysUserDetails; -import com.youlai.boot.core.security.model.UserAuthCredentials; +import com.youlai.boot.security.model.SysUserDetails; +import com.youlai.boot.security.model.UserAuthCredentials; +import com.youlai.boot.security.model.WxMiniAppCodeAuthenticationToken; import com.youlai.boot.system.service.UserService; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppPhoneAuthenticationProvider.java b/src/main/java/com/youlai/boot/security/provider/WxMiniAppPhoneAuthenticationProvider.java similarity index 95% rename from src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppPhoneAuthenticationProvider.java rename to src/main/java/com/youlai/boot/security/provider/WxMiniAppPhoneAuthenticationProvider.java index c38f1e3f..2bcc933a 100644 --- a/src/main/java/com/youlai/boot/core/security/extension/wx/WxMiniAppPhoneAuthenticationProvider.java +++ b/src/main/java/com/youlai/boot/security/provider/WxMiniAppPhoneAuthenticationProvider.java @@ -1,12 +1,13 @@ -package com.youlai.boot.core.security.extension.wx; +package com.youlai.boot.security.provider; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.boot.core.security.model.SysUserDetails; -import com.youlai.boot.core.security.model.UserAuthCredentials; +import com.youlai.boot.security.model.SysUserDetails; +import com.youlai.boot.security.model.UserAuthCredentials; +import com.youlai.boot.security.model.WxMiniAppPhoneAuthenticationToken; import com.youlai.boot.system.service.UserService; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/src/main/java/com/youlai/boot/core/security/service/PermissionService.java b/src/main/java/com/youlai/boot/security/service/PermissionService.java similarity index 96% rename from src/main/java/com/youlai/boot/core/security/service/PermissionService.java rename to src/main/java/com/youlai/boot/security/service/PermissionService.java index 0f7448c9..8b11ad4e 100644 --- a/src/main/java/com/youlai/boot/core/security/service/PermissionService.java +++ b/src/main/java/com/youlai/boot/security/service/PermissionService.java @@ -1,9 +1,9 @@ -package com.youlai.boot.core.security.service; +package com.youlai.boot.security.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.RedisConstants; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java b/src/main/java/com/youlai/boot/security/service/SysUserDetailsService.java similarity index 89% rename from src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java rename to src/main/java/com/youlai/boot/security/service/SysUserDetailsService.java index 86b70db8..213b698f 100644 --- a/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java +++ b/src/main/java/com/youlai/boot/security/service/SysUserDetailsService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.core.security.service; +package com.youlai.boot.security.service; -import com.youlai.boot.core.security.model.SysUserDetails; -import com.youlai.boot.core.security.model.UserAuthCredentials; +import com.youlai.boot.security.model.SysUserDetails; +import com.youlai.boot.security.model.UserAuthCredentials; import com.youlai.boot.system.service.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/core/security/token/JwtTokenManager.java b/src/main/java/com/youlai/boot/security/token/JwtTokenManager.java similarity index 97% rename from src/main/java/com/youlai/boot/core/security/token/JwtTokenManager.java rename to src/main/java/com/youlai/boot/security/token/JwtTokenManager.java index 805000a0..1ee154e4 100644 --- a/src/main/java/com/youlai/boot/core/security/token/JwtTokenManager.java +++ b/src/main/java/com/youlai/boot/security/token/JwtTokenManager.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.security.token; +package com.youlai.boot.security.token; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; @@ -12,11 +12,11 @@ import com.youlai.boot.common.constant.JwtClaimConstants; 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.core.web.ResultCode; import com.youlai.boot.config.property.SecurityProperties; -import com.youlai.boot.core.security.model.AuthenticationToken; +import com.youlai.boot.security.model.AuthenticationToken; import org.apache.commons.lang3.StringUtils; -import com.youlai.boot.core.security.model.SysUserDetails; +import com.youlai.boot.security.model.SysUserDetails; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/com/youlai/boot/core/security/token/RedisTokenManager.java b/src/main/java/com/youlai/boot/security/token/RedisTokenManager.java similarity index 97% rename from src/main/java/com/youlai/boot/core/security/token/RedisTokenManager.java rename to src/main/java/com/youlai/boot/security/token/RedisTokenManager.java index 604b0ae2..51113ede 100644 --- a/src/main/java/com/youlai/boot/core/security/token/RedisTokenManager.java +++ b/src/main/java/com/youlai/boot/security/token/RedisTokenManager.java @@ -1,15 +1,15 @@ -package com.youlai.boot.core.security.token; +package com.youlai.boot.security.token; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.common.result.ResultCode; +import com.youlai.boot.core.web.ResultCode; import com.youlai.boot.config.property.SecurityProperties; -import com.youlai.boot.core.security.model.AuthenticationToken; -import com.youlai.boot.core.security.model.OnlineUser; -import com.youlai.boot.core.security.model.SysUserDetails; +import com.youlai.boot.security.model.AuthenticationToken; +import com.youlai.boot.security.model.OnlineUser; +import com.youlai.boot.security.model.SysUserDetails; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/com/youlai/boot/core/security/token/TokenManager.java b/src/main/java/com/youlai/boot/security/token/TokenManager.java similarity index 92% rename from src/main/java/com/youlai/boot/core/security/token/TokenManager.java rename to src/main/java/com/youlai/boot/security/token/TokenManager.java index 4d516879..3c051dc4 100644 --- a/src/main/java/com/youlai/boot/core/security/token/TokenManager.java +++ b/src/main/java/com/youlai/boot/security/token/TokenManager.java @@ -1,7 +1,7 @@ -package com.youlai.boot.core.security.token; +package com.youlai.boot.security.token; -import com.youlai.boot.core.security.model.AuthenticationToken; +import com.youlai.boot.security.model.AuthenticationToken; import org.springframework.security.core.Authentication; /** diff --git a/src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java b/src/main/java/com/youlai/boot/security/util/SecurityUtils.java similarity index 97% rename from src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java rename to src/main/java/com/youlai/boot/security/util/SecurityUtils.java index 01c2d921..48372e53 100644 --- a/src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java +++ b/src/main/java/com/youlai/boot/security/util/SecurityUtils.java @@ -1,10 +1,10 @@ -package com.youlai.boot.core.security.util; +package com.youlai.boot.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.common.constant.SystemConstants; -import com.youlai.boot.core.security.model.SysUserDetails; +import com.youlai.boot.security.model.SysUserDetails; import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpHeaders; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/youlai/boot/system/controller/ConfigController.java b/src/main/java/com/youlai/boot/system/controller/ConfigController.java index dd384d9c..1e8d446b 100644 --- a/src/main/java/com/youlai/boot/system/controller/ConfigController.java +++ b/src/main/java/com/youlai/boot/system/controller/ConfigController.java @@ -2,8 +2,8 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.common.result.PageResult; -import com.youlai.boot.common.result.Result; +import com.youlai.boot.core.web.PageResult; +import com.youlai.boot.core.web.Result; import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.model.form.ConfigForm; import com.youlai.boot.system.model.query.ConfigPageQuery; 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 39016286..f1064353 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.LogModuleEnum; import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.model.Option; -import com.youlai.boot.common.result.Result; +import com.youlai.boot.core.web.Result; import com.youlai.boot.system.model.form.DeptForm; import com.youlai.boot.system.model.query.DeptQuery; import com.youlai.boot.system.model.vo.DeptVO; 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 e4825301..537cd87b 100644 --- a/src/main/java/com/youlai/boot/system/controller/DictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -2,8 +2,8 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.core.web.PageResult; +import com.youlai.boot.core.web.Result; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.system.model.form.DictItemForm; import com.youlai.boot.system.model.query.DictItemPageQuery; diff --git a/src/main/java/com/youlai/boot/system/controller/LogController.java b/src/main/java/com/youlai/boot/system/controller/LogController.java index 1db2613c..46e312c1 100644 --- a/src/main/java/com/youlai/boot/system/controller/LogController.java +++ b/src/main/java/com/youlai/boot/system/controller/LogController.java @@ -1,8 +1,8 @@ package com.youlai.boot.system.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.core.web.PageResult; +import com.youlai.boot.core.web.Result; import com.youlai.boot.system.model.query.LogPageQuery; import com.youlai.boot.system.model.vo.LogPageVO; import com.youlai.boot.system.model.vo.VisitStatsVO; 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 fd897650..c35199f4 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.LogModuleEnum; import com.youlai.boot.common.model.Option; -import com.youlai.boot.common.result.Result; +import com.youlai.boot.core.web.Result; import com.youlai.boot.system.model.form.MenuForm; 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/controller/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java index f08198e0..3d38a08a 100644 --- a/src/main/java/com/youlai/boot/system/controller/NoticeController.java +++ b/src/main/java/com/youlai/boot/system/controller/NoticeController.java @@ -1,8 +1,8 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.youlai.boot.common.result.PageResult; -import com.youlai.boot.common.result.Result; +import com.youlai.boot.core.web.PageResult; +import com.youlai.boot.core.web.Result; import com.youlai.boot.system.model.form.NoticeForm; import com.youlai.boot.system.model.query.NoticePageQuery; import com.youlai.boot.system.model.vo.NoticeDetailVO; 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 a8a062f2..fef84c40 100644 --- a/src/main/java/com/youlai/boot/system/controller/RoleController.java +++ b/src/main/java/com/youlai/boot/system/controller/RoleController.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.annotation.RepeatSubmit; 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.core.web.PageResult; +import com.youlai.boot.core.web.Result; import com.youlai.boot.system.model.form.RoleForm; import com.youlai.boot.system.model.query.RolePageQuery; import com.youlai.boot.system.model.vo.RolePageVO; 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 87a1c5a1..7b7d98ec 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -8,11 +8,11 @@ import com.youlai.boot.common.annotation.Log; import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.enums.LogModuleEnum; 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; +import com.youlai.boot.core.web.ExcelResult; +import com.youlai.boot.core.web.PageResult; +import com.youlai.boot.core.web.Result; import com.youlai.boot.common.util.ExcelUtils; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.listener.UserImportListener; import com.youlai.boot.system.model.dto.UserExportDTO; import com.youlai.boot.system.model.dto.UserImportDTO; 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 806d7e60..a699fb54 100644 --- a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java +++ b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java @@ -11,7 +11,7 @@ import cn.idev.excel.event.AnalysisEventListener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.core.web.ExcelResult; import com.youlai.boot.system.converter.UserConverter; import com.youlai.boot.system.enums.DictCodeEnum; import com.youlai.boot.system.model.dto.UserImportDTO; diff --git a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java index 74d3388f..74af1bd5 100644 --- a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java @@ -7,7 +7,7 @@ import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.query.UserPageQuery; import com.youlai.boot.system.model.form.UserForm; import com.youlai.boot.common.annotation.DataPermission; -import com.youlai.boot.core.security.model.UserAuthCredentials; +import com.youlai.boot.security.model.UserAuthCredentials; import com.youlai.boot.system.model.dto.UserExportDTO; import org.apache.ibatis.annotations.Mapper; 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 eb0ba54b..6fbff3f3 100644 --- a/src/main/java/com/youlai/boot/system/service/MenuService.java +++ b/src/main/java/com/youlai/boot/system/service/MenuService.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.shared.codegen.model.entity.GenConfig; +import com.youlai.boot.platform.codegen.model.entity.GenConfig; import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.entity.Menu; diff --git a/src/main/java/com/youlai/boot/system/service/UserOnlineService.java b/src/main/java/com/youlai/boot/system/service/UserOnlineService.java index d3b9794a..8200a457 100644 --- a/src/main/java/com/youlai/boot/system/service/UserOnlineService.java +++ b/src/main/java/com/youlai/boot/system/service/UserOnlineService.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.youlai.boot.core.security.model.SysUserDetails; +import com.youlai.boot.security.model.SysUserDetails; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 804569e3..9b8660ba 100644 --- a/src/main/java/com/youlai/boot/system/service/UserService.java +++ b/src/main/java/com/youlai/boot/system/service/UserService.java @@ -3,7 +3,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.common.model.Option; -import com.youlai.boot.core.security.model.UserAuthCredentials; +import com.youlai.boot.security.model.UserAuthCredentials; import com.youlai.boot.system.model.dto.CurrentUserDTO; import com.youlai.boot.system.model.dto.UserExportDTO; import com.youlai.boot.system.model.entity.User; diff --git a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java index 3c939dca..e4e12c26 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java @@ -13,7 +13,7 @@ import com.youlai.boot.system.model.form.ConfigForm; import com.youlai.boot.system.model.query.ConfigPageQuery; import com.youlai.boot.system.model.vo.ConfigVO; import com.youlai.boot.system.service.ConfigService; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java index ee7e76e1..39a60deb 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 @@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.converter.DeptConverter; import com.youlai.boot.system.mapper.DeptMapper; import com.youlai.boot.system.model.entity.Dept; 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 313c564f..4b2a644e 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 @@ -10,10 +10,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.platform.codegen.model.entity.GenConfig; +import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.converter.MenuConverter; import com.youlai.boot.system.mapper.MenuMapper; -import com.youlai.boot.shared.codegen.model.entity.GenConfig; import com.youlai.boot.system.model.entity.Menu; 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/service/impl/NoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java index e78c876e..407ef6de 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.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.converter.NoticeConverter; import com.youlai.boot.system.enums.NoticePublishStatusEnum; import com.youlai.boot.system.enums.NoticeTargetEnum; 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 e56a0271..b08955df 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 @@ -17,7 +17,7 @@ import com.youlai.boot.system.model.query.RolePageQuery; import com.youlai.boot.system.model.vo.RolePageVO; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.model.Option; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.service.RoleMenuService; import com.youlai.boot.system.service.RoleService; import com.youlai.boot.system.service.UserRoleService; diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java index f44489ba..aa82529c 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.mapper.UserNoticeMapper; import com.youlai.boot.system.model.entity.UserNotice; import com.youlai.boot.system.model.query.NoticePageQuery; diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserRoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserRoleServiceImpl.java index 6b27244b..148ea570 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserRoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserRoleServiceImpl.java @@ -3,8 +3,8 @@ package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.core.security.token.TokenManager; -import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.security.token.TokenManager; +import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.mapper.UserRoleMapper; import com.youlai.boot.system.model.entity.UserRole; import com.youlai.boot.system.service.UserRoleService; 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 9d8fafba..745c1d67 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 @@ -12,13 +12,13 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.common.model.Option; -import com.youlai.boot.core.security.model.UserAuthCredentials; -import com.youlai.boot.core.security.service.PermissionService; -import com.youlai.boot.core.security.token.TokenManager; -import com.youlai.boot.core.security.util.SecurityUtils; -import com.youlai.boot.shared.mail.service.MailService; -import com.youlai.boot.shared.sms.enums.SmsTypeEnum; -import com.youlai.boot.shared.sms.service.SmsService; +import com.youlai.boot.platform.sms.enums.SmsTypeEnum; +import com.youlai.boot.platform.sms.service.SmsService; +import com.youlai.boot.security.model.UserAuthCredentials; +import com.youlai.boot.security.service.PermissionService; +import com.youlai.boot.security.token.TokenManager; +import com.youlai.boot.security.util.SecurityUtils; +import com.youlai.boot.platform.mail.service.MailService; import com.youlai.boot.system.converter.UserConverter; import com.youlai.boot.system.enums.DictCodeEnum; import com.youlai.boot.system.mapper.UserMapper; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 207f1fc1..412f9494 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -158,8 +158,8 @@ springdoc: packages-to-scan: - com.youlai.boot.auth.controller - com.youlai.boot.system.controller - - com.youlai.boot.shared.file.controller - - com.youlai.boot.shared.codegen.controller + - com.youlai.boot.platform.file.controller + - com.youlai.boot.platform.codegen.controller default-flat-param-object: true # knife4j 接口文档配置 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index b1309efa..53695a35 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -155,8 +155,8 @@ springdoc: packages-to-scan: - com.youlai.boot.auth.controller - com.youlai.boot.system.controller - - com.youlai.boot.shared.file.controller - - com.youlai.boot.shared.codegen.controller + - com.youlai.boot.platform.file.controller + - com.youlai.boot.platform.codegen.controller default-flat-param-object: true # knife4j 接口文档配置 diff --git a/src/main/resources/mapper/codegen/DatabaseMapper.xml b/src/main/resources/mapper/codegen/DatabaseMapper.xml index 1fd0376a..d923000c 100644 --- a/src/main/resources/mapper/codegen/DatabaseMapper.xml +++ b/src/main/resources/mapper/codegen/DatabaseMapper.xml @@ -2,10 +2,10 @@ - + - SELECT t1.TABLE_NAME , t1.TABLE_COMMENT , @@ -33,7 +33,7 @@ CREATE_TIME DESC - SELECT TABLE_NAME , TABLE_COMMENT , @@ -47,7 +47,7 @@ AND TABLE_NAME = #{tableName} - SELECT COLUMN_NAME, DATA_TYPE, diff --git a/src/main/resources/mapper/codegen/GenConfigMapper.xml b/src/main/resources/mapper/codegen/GenConfigMapper.xml index 996587bd..02709a91 100644 --- a/src/main/resources/mapper/codegen/GenConfigMapper.xml +++ b/src/main/resources/mapper/codegen/GenConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/codegen/GenFieldConfigMapper.xml b/src/main/resources/mapper/codegen/GenFieldConfigMapper.xml index 287e9634..0bd4db31 100644 --- a/src/main/resources/mapper/codegen/GenFieldConfigMapper.xml +++ b/src/main/resources/mapper/codegen/GenFieldConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml index 751147da..4e281a17 100644 --- a/src/main/resources/mapper/system/UserMapper.xml +++ b/src/main/resources/mapper/system/UserMapper.xml @@ -119,7 +119,7 @@ - + diff --git a/src/test/java/com/youlai/boot/generator/SystemCodeGenerator.java b/src/test/java/com/youlai/boot/generator/SystemCodeGenerator.java index 2a2e1834..23c018c3 100644 --- a/src/test/java/com/youlai/boot/generator/SystemCodeGenerator.java +++ b/src/test/java/com/youlai/boot/generator/SystemCodeGenerator.java @@ -39,8 +39,8 @@ public class SystemCodeGenerator { .parent("com.youlai.boot.system") .entity("model.entity") .mapper("mapper") - .service("service") - .serviceImpl("service.impl") + .service("platform") + .serviceImpl("platform.impl") .controller("controller") .pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/src/main/resources/mapper")); }