diff --git a/sql/mysql5/youlai_boot.sql b/sql/mysql5/youlai_boot.sql index acd7f106..bbd5dc8a 100644 --- a/sql/mysql5/youlai_boot.sql +++ b/sql/mysql5/youlai_boot.sql @@ -215,7 +215,7 @@ INSERT INTO `sys_menu` VALUES (110, 0, '0', '路由参数', 2, NULL, '/route-par INSERT INTO `sys_menu` VALUES (111, 110, '0,110', '参数(type=1)', 1, NULL, 'route-param-type1', 'demo/route-param', NULL, 0, 1, 1, 1, 'el-icon-Star', NULL, '2024-05-26 21:59:24', '2024-05-26 21:59:37', '{\"type\": \"1\"}'); INSERT INTO `sys_menu` VALUES (112, 110, '0,110', '参数(type=2)', 1, NULL, 'route-param-type2', 'demo/route-param', NULL, 0, 1, 1, 2, 'el-icon-StarFilled', NULL, '2024-05-26 21:46:55', '2024-05-26 21:59:45', '{\"type\": \"2\"}'); INSERT INTO `sys_menu` VALUES (117, 1, '0,1', '系统日志', 1, 'Log', 'log', 'system/log/index', NULL, 0, 1, 1, 6, 'document', NULL, '2024-06-28 07:43:16', '2024-06-28 07:43:16', NULL); -INSERT INTO `sys_menu` VALUES (118, 0, '0', '系统工具', 2, NULL, '/tool', 'Layout', NULL, 0, 1, 1, 2, 'menu', NULL, '2024-07-13 08:41:07', '2024-07-13 08:41:07', NULL); +INSERT INTO `sys_menu` VALUES (118, 0, '0', '系统工具', 2, NULL, '/generator', 'Layout', NULL, 0, 1, 1, 2, 'menu', NULL, '2024-07-13 08:41:07', '2024-07-13 08:41:07', NULL); INSERT INTO `sys_menu` VALUES (119, 118, '0,118', '代码生成(Alpha)', 1, 'Generator', 'generator', 'generator/index', NULL, 0, 1, 1, 1, 'code', NULL, '2024-07-13 08:44:51', '2024-07-13 08:44:51', NULL); -- ---------------------------- diff --git a/sql/mysql8/youlai_boot.sql b/sql/mysql8/youlai_boot.sql index dd7beda1..f11a8f15 100644 --- a/sql/mysql8/youlai_boot.sql +++ b/sql/mysql8/youlai_boot.sql @@ -216,7 +216,7 @@ INSERT INTO `sys_menu` VALUES (110, 0, '0', '路由参数', 2, NULL, '/route-par INSERT INTO `sys_menu` VALUES (111, 110, '0,110', '参数(type=1)', 1, NULL, 'route-param-type1', 'demo/route-param', NULL, 0, 1, 1, 1, 'el-icon-Star', NULL, '2024-05-26 21:59:24', '2024-05-26 21:59:37', '{\"type\": \"1\"}'); INSERT INTO `sys_menu` VALUES (112, 110, '0,110', '参数(type=2)', 1, NULL, 'route-param-type2', 'demo/route-param', NULL, 0, 1, 1, 2, 'el-icon-StarFilled', NULL, '2024-05-26 21:46:55', '2024-05-26 21:59:45', '{\"type\": \"2\"}'); INSERT INTO `sys_menu` VALUES (117, 1, '0,1', '系统日志', 1, 'Log', 'log', 'system/log/index', NULL, 0, 1, 1, 6, 'document', NULL, '2024-06-28 07:43:16', '2024-06-28 07:43:16', NULL); -INSERT INTO `sys_menu` VALUES (118, 0, '0', '系统工具', 2, NULL, '/tool', 'Layout', NULL, 0, 1, 1, 2, 'menu', NULL, '2024-07-13 08:41:07', '2024-07-13 08:41:07', NULL); +INSERT INTO `sys_menu` VALUES (118, 0, '0', '系统工具', 2, NULL, '/generator', 'Layout', NULL, 0, 1, 1, 2, 'menu', NULL, '2024-07-13 08:41:07', '2024-07-13 08:41:07', NULL); INSERT INTO `sys_menu` VALUES (119, 118, '0,118', '代码生成(Alpha)', 1, 'Generator', 'generator', 'generator/index', NULL, 0, 1, 1, 1, 'code', NULL, '2024-07-13 08:44:51', '2024-07-13 08:44:51', NULL); -- ---------------------------- diff --git a/src/main/java/com/youlai/system/SystemApplication.java b/src/main/java/com/youlai/boot/BootApplication.java similarity index 76% rename from src/main/java/com/youlai/system/SystemApplication.java rename to src/main/java/com/youlai/boot/BootApplication.java index 7d844380..0cadb649 100644 --- a/src/main/java/com/youlai/system/SystemApplication.java +++ b/src/main/java/com/youlai/boot/BootApplication.java @@ -1,4 +1,4 @@ -package com.youlai.system; +package com.youlai.boot; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -8,8 +8,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @ConfigurationPropertiesScan @EnableScheduling -public class SystemApplication { +public class BootApplication { public static void main(String[] args) { - SpringApplication.run(SystemApplication.class, args); + SpringApplication.run(BootApplication.class, args); } } diff --git a/src/main/java/com/youlai/system/plugin/mybatis/annotation/DataPermission.java b/src/main/java/com/youlai/boot/common/annotation/DataPermission.java similarity index 90% rename from src/main/java/com/youlai/system/plugin/mybatis/annotation/DataPermission.java rename to src/main/java/com/youlai/boot/common/annotation/DataPermission.java index ef9d0e4e..83aba255 100644 --- a/src/main/java/com/youlai/system/plugin/mybatis/annotation/DataPermission.java +++ b/src/main/java/com/youlai/boot/common/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.mybatis.annotation; +package com.youlai.boot.common.annotation; import java.lang.annotation.*; diff --git a/src/main/java/com/youlai/system/plugin/syslog/annotation/LogAnnotation.java b/src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java similarity index 85% rename from src/main/java/com/youlai/system/plugin/syslog/annotation/LogAnnotation.java rename to src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java index 7ec75b30..c60cd3e9 100644 --- a/src/main/java/com/youlai/system/plugin/syslog/annotation/LogAnnotation.java +++ b/src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.syslog.annotation; +package com.youlai.boot.common.annotation; import com.youlai.system.enums.LogModuleEnum; diff --git a/src/main/java/com/youlai/system/plugin/norepeat/annotation/PreventRepeatSubmit.java b/src/main/java/com/youlai/boot/common/annotation/NoRepeat.java similarity index 82% rename from src/main/java/com/youlai/system/plugin/norepeat/annotation/PreventRepeatSubmit.java rename to src/main/java/com/youlai/boot/common/annotation/NoRepeat.java index a767e2ee..82489843 100644 --- a/src/main/java/com/youlai/system/plugin/norepeat/annotation/PreventRepeatSubmit.java +++ b/src/main/java/com/youlai/boot/common/annotation/NoRepeat.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.norepeat.annotation; +package com.youlai.boot.common.annotation; import java.lang.annotation.*; @@ -16,7 +16,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -public @interface PreventRepeatSubmit { +public @interface NoRepeat { /** * 锁过期时间（秒） diff --git a/src/main/java/com/youlai/system/plugin/easyexcel/MyAnalysisEventListener.java b/src/main/java/com/youlai/boot/common/base/BaseAnalysisEventListener.java similarity index 61% rename from src/main/java/com/youlai/system/plugin/easyexcel/MyAnalysisEventListener.java rename to src/main/java/com/youlai/boot/common/base/BaseAnalysisEventListener.java index 74b7c512..e118a9e8 100644 --- a/src/main/java/com/youlai/system/plugin/easyexcel/MyAnalysisEventListener.java +++ b/src/main/java/com/youlai/boot/common/base/BaseAnalysisEventListener.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.easyexcel; +package com.youlai.boot.common.base; import com.alibaba.excel.event.AnalysisEventListener; @@ -8,7 +8,7 @@ import com.alibaba.excel.event.AnalysisEventListener; * @author haoxr * @since 2023/03/01 */ -public abstract class MyAnalysisEventListener extends AnalysisEventListener { +public abstract class BaseAnalysisEventListener extends AnalysisEventListener { private String msg; public abstract String getMsg(); diff --git a/src/main/java/com/youlai/system/common/base/BaseEntity.java b/src/main/java/com/youlai/boot/common/base/BaseEntity.java similarity index 96% rename from src/main/java/com/youlai/system/common/base/BaseEntity.java rename to src/main/java/com/youlai/boot/common/base/BaseEntity.java index 89320fd2..9c6a2812 100644 --- a/src/main/java/com/youlai/system/common/base/BaseEntity.java +++ b/src/main/java/com/youlai/boot/common/base/BaseEntity.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.base; +package com.youlai.boot.common.base; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/youlai/system/common/base/BasePageQuery.java b/src/main/java/com/youlai/boot/common/base/BasePageQuery.java similarity index 92% rename from src/main/java/com/youlai/system/common/base/BasePageQuery.java rename to src/main/java/com/youlai/boot/common/base/BasePageQuery.java index e6b54b2c..ab8deac4 100644 --- a/src/main/java/com/youlai/system/common/base/BasePageQuery.java +++ b/src/main/java/com/youlai/boot/common/base/BasePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.base; +package com.youlai.boot.common.base; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/common/base/BaseVO.java b/src/main/java/com/youlai/boot/common/base/BaseVO.java similarity index 88% rename from src/main/java/com/youlai/system/common/base/BaseVO.java rename to src/main/java/com/youlai/boot/common/base/BaseVO.java index 51cc6f77..bd1f540f 100644 --- a/src/main/java/com/youlai/system/common/base/BaseVO.java +++ b/src/main/java/com/youlai/boot/common/base/BaseVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.base; +package com.youlai.boot.common.base; import lombok.Data; import lombok.ToString; diff --git a/src/main/java/com/youlai/system/common/base/IBaseEnum.java b/src/main/java/com/youlai/boot/common/base/IBaseEnum.java similarity index 98% rename from src/main/java/com/youlai/system/common/base/IBaseEnum.java rename to src/main/java/com/youlai/boot/common/base/IBaseEnum.java index c0be080e..0a44cd81 100644 --- a/src/main/java/com/youlai/system/common/base/IBaseEnum.java +++ b/src/main/java/com/youlai/boot/common/base/IBaseEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.base; +package com.youlai.boot.common.base; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/com/youlai/system/common/constant/JwtClaimConstants.java b/src/main/java/com/youlai/boot/common/constant/JwtClaimConstants.java similarity index 92% rename from src/main/java/com/youlai/system/common/constant/JwtClaimConstants.java rename to src/main/java/com/youlai/boot/common/constant/JwtClaimConstants.java index c9efca82..a74ac0a3 100644 --- a/src/main/java/com/youlai/system/common/constant/JwtClaimConstants.java +++ b/src/main/java/com/youlai/boot/common/constant/JwtClaimConstants.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.constant; +package com.youlai.boot.common.constant; /** * JWT Claims声明常量 diff --git a/src/main/java/com/youlai/system/common/constant/RedisConstants.java b/src/main/java/com/youlai/boot/common/constant/RedisConstants.java similarity index 94% rename from src/main/java/com/youlai/system/common/constant/RedisConstants.java rename to src/main/java/com/youlai/boot/common/constant/RedisConstants.java index 056d6549..48ca4765 100644 --- a/src/main/java/com/youlai/system/common/constant/RedisConstants.java +++ b/src/main/java/com/youlai/boot/common/constant/RedisConstants.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.constant; +package com.youlai.boot.common.constant; /** * Redis Key常量 diff --git a/src/main/java/com/youlai/system/common/constant/SecurityConstants.java b/src/main/java/com/youlai/boot/common/constant/SecurityConstants.java similarity index 93% rename from src/main/java/com/youlai/system/common/constant/SecurityConstants.java rename to src/main/java/com/youlai/boot/common/constant/SecurityConstants.java index 11ea3f08..3a3128b0 100644 --- a/src/main/java/com/youlai/system/common/constant/SecurityConstants.java +++ b/src/main/java/com/youlai/boot/common/constant/SecurityConstants.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.constant; +package com.youlai.boot.common.constant; /** * 缓存常量 diff --git a/src/main/java/com/youlai/system/common/constant/SymbolConstant.java b/src/main/java/com/youlai/boot/common/constant/SymbolConstant.java similarity index 97% rename from src/main/java/com/youlai/system/common/constant/SymbolConstant.java rename to src/main/java/com/youlai/boot/common/constant/SymbolConstant.java index 0f14d539..49f670ee 100644 --- a/src/main/java/com/youlai/system/common/constant/SymbolConstant.java +++ b/src/main/java/com/youlai/boot/common/constant/SymbolConstant.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.constant; +package com.youlai.boot.common.constant; /** * 符号和特殊符号常用类 diff --git a/src/main/java/com/youlai/system/common/constant/SystemConstants.java b/src/main/java/com/youlai/boot/common/constant/SystemConstants.java similarity index 88% rename from src/main/java/com/youlai/system/common/constant/SystemConstants.java rename to src/main/java/com/youlai/boot/common/constant/SystemConstants.java index 7c20d77a..321ea651 100644 --- a/src/main/java/com/youlai/system/common/constant/SystemConstants.java +++ b/src/main/java/com/youlai/boot/common/constant/SystemConstants.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.constant; +package com.youlai.boot.common.constant; /** * 系统常量 diff --git a/src/main/java/com/youlai/system/enums/CaptchaTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/CaptchaTypeEnum.java similarity index 89% rename from src/main/java/com/youlai/system/enums/CaptchaTypeEnum.java rename to src/main/java/com/youlai/boot/common/enums/CaptchaTypeEnum.java index b6376b1e..8d3fe10e 100644 --- a/src/main/java/com/youlai/system/enums/CaptchaTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/CaptchaTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; /** * EasyCaptcha 验证码类型枚举 diff --git a/src/main/java/com/youlai/system/enums/ContactType.java b/src/main/java/com/youlai/boot/common/enums/ContactType.java similarity index 82% rename from src/main/java/com/youlai/system/enums/ContactType.java rename to src/main/java/com/youlai/boot/common/enums/ContactType.java index e0f1be45..317a0516 100644 --- a/src/main/java/com/youlai/system/enums/ContactType.java +++ b/src/main/java/com/youlai/boot/common/enums/ContactType.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; /** * 联系方式类型 diff --git a/src/main/java/com/youlai/system/enums/DataScopeEnum.java b/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java similarity index 93% rename from src/main/java/com/youlai/system/enums/DataScopeEnum.java rename to src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java index 97cd86e7..b71ea866 100644 --- a/src/main/java/com/youlai/system/enums/DataScopeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/enums/FormTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java similarity index 97% rename from src/main/java/com/youlai/system/enums/FormTypeEnum.java rename to src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java index 81923ddc..cece51e3 100644 --- a/src/main/java/com/youlai/system/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/system/enums/GenderEnum.java b/src/main/java/com/youlai/boot/common/enums/GenderEnum.java similarity index 92% rename from src/main/java/com/youlai/system/enums/GenderEnum.java rename to src/main/java/com/youlai/boot/common/enums/GenderEnum.java index a8fbb415..c5c03313 100644 --- a/src/main/java/com/youlai/system/enums/GenderEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/GenderEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.youlai.system.common.base.IBaseEnum; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/enums/JavaTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/JavaTypeEnum.java similarity index 98% rename from src/main/java/com/youlai/system/enums/JavaTypeEnum.java rename to src/main/java/com/youlai/boot/common/enums/JavaTypeEnum.java index 107c80e7..74d5c689 100644 --- a/src/main/java/com/youlai/system/enums/JavaTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/JavaTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/enums/LogModuleEnum.java b/src/main/java/com/youlai/boot/common/enums/LogModuleEnum.java similarity index 93% rename from src/main/java/com/youlai/system/enums/LogModuleEnum.java rename to src/main/java/com/youlai/boot/common/enums/LogModuleEnum.java index 6a7dfeba..db0b2df0 100644 --- a/src/main/java/com/youlai/system/enums/LogModuleEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/LogModuleEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/enums/MenuTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/MenuTypeEnum.java similarity index 94% rename from src/main/java/com/youlai/system/enums/MenuTypeEnum.java rename to src/main/java/com/youlai/boot/common/enums/MenuTypeEnum.java index 0ed32a38..f3d333f2 100644 --- a/src/main/java/com/youlai/system/enums/MenuTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/MenuTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.youlai.system.common.base.IBaseEnum; diff --git a/src/main/java/com/youlai/system/enums/QueryTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java similarity index 97% rename from src/main/java/com/youlai/system/enums/QueryTypeEnum.java rename to src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java index c6e15470..986fc67b 100644 --- a/src/main/java/com/youlai/system/enums/QueryTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/system/enums/StatusEnum.java b/src/main/java/com/youlai/boot/common/enums/StatusEnum.java similarity index 91% rename from src/main/java/com/youlai/system/enums/StatusEnum.java rename to src/main/java/com/youlai/boot/common/enums/StatusEnum.java index 678afe16..59a12126 100644 --- a/src/main/java/com/youlai/system/enums/StatusEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/StatusEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/exception/BusinessException.java b/src/main/java/com/youlai/boot/common/exception/BusinessException.java similarity index 89% rename from src/main/java/com/youlai/system/exception/BusinessException.java rename to src/main/java/com/youlai/boot/common/exception/BusinessException.java index 62f483ac..c74ae972 100644 --- a/src/main/java/com/youlai/system/exception/BusinessException.java +++ b/src/main/java/com/youlai/boot/common/exception/BusinessException.java @@ -1,6 +1,6 @@ -package com.youlai.system.exception; +package com.youlai.boot.common.exception; -import com.youlai.system.common.result.IResultCode; +import com.youlai.boot.common.result.IResultCode; import lombok.Getter; import org.slf4j.helpers.MessageFormatter; diff --git a/src/main/java/com/youlai/system/exception/GlobalExceptionHandler.java b/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java similarity index 99% rename from src/main/java/com/youlai/system/exception/GlobalExceptionHandler.java rename to src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java index 6cdfae7d..9f6bb028 100644 --- a/src/main/java/com/youlai/system/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.exception; +package com.youlai.boot.common.exception; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/com/youlai/system/common/model/KeyValue.java b/src/main/java/com/youlai/boot/common/model/KeyValue.java similarity index 93% rename from src/main/java/com/youlai/system/common/model/KeyValue.java rename to src/main/java/com/youlai/boot/common/model/KeyValue.java index 772dd7a5..9d8ec18c 100644 --- a/src/main/java/com/youlai/system/common/model/KeyValue.java +++ b/src/main/java/com/youlai/boot/common/model/KeyValue.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.model; +package com.youlai.boot.common.model; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/common/model/Option.java b/src/main/java/com/youlai/boot/common/model/Option.java similarity index 95% rename from src/main/java/com/youlai/system/common/model/Option.java rename to src/main/java/com/youlai/boot/common/model/Option.java index e083c9b3..895222da 100644 --- a/src/main/java/com/youlai/system/common/model/Option.java +++ b/src/main/java/com/youlai/boot/common/model/Option.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.model; +package com.youlai.boot.common.model; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/common/result/IResultCode.java b/src/main/java/com/youlai/boot/common/result/IResultCode.java similarity index 78% rename from src/main/java/com/youlai/system/common/result/IResultCode.java rename to src/main/java/com/youlai/boot/common/result/IResultCode.java index fa7aef64..479639e3 100644 --- a/src/main/java/com/youlai/system/common/result/IResultCode.java +++ b/src/main/java/com/youlai/boot/common/result/IResultCode.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.result; +package com.youlai.boot.common.result; /** * 响应码接口 diff --git a/src/main/java/com/youlai/system/common/result/PageResult.java b/src/main/java/com/youlai/boot/common/result/PageResult.java similarity index 95% rename from src/main/java/com/youlai/system/common/result/PageResult.java rename to src/main/java/com/youlai/boot/common/result/PageResult.java index 68860831..5e0f2779 100644 --- a/src/main/java/com/youlai/system/common/result/PageResult.java +++ b/src/main/java/com/youlai/boot/common/result/PageResult.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.result; +package com.youlai.boot.common.result; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.Data; diff --git a/src/main/java/com/youlai/system/common/result/Result.java b/src/main/java/com/youlai/boot/common/result/Result.java similarity index 97% rename from src/main/java/com/youlai/system/common/result/Result.java rename to src/main/java/com/youlai/boot/common/result/Result.java index be1ea1ce..a464962b 100644 --- a/src/main/java/com/youlai/system/common/result/Result.java +++ b/src/main/java/com/youlai/boot/common/result/Result.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.result; +package com.youlai.boot.common.result; import lombok.Data; diff --git a/src/main/java/com/youlai/system/common/result/ResultCode.java b/src/main/java/com/youlai/boot/common/result/ResultCode.java similarity index 98% rename from src/main/java/com/youlai/system/common/result/ResultCode.java rename to src/main/java/com/youlai/boot/common/result/ResultCode.java index 09b03fd2..fd51e37a 100644 --- a/src/main/java/com/youlai/system/common/result/ResultCode.java +++ b/src/main/java/com/youlai/boot/common/result/ResultCode.java @@ -1,4 +1,4 @@ -package com.youlai.system.common.result; +package com.youlai.boot.common.result; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/youlai/system/service/MailService.java b/src/main/java/com/youlai/boot/common/service/MailService.java similarity index 94% rename from src/main/java/com/youlai/system/service/MailService.java rename to src/main/java/com/youlai/boot/common/service/MailService.java index cf629a1d..75f8fce6 100644 --- a/src/main/java/com/youlai/system/service/MailService.java +++ b/src/main/java/com/youlai/boot/common/service/MailService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service; +package com.youlai.boot.common.service; /** * 邮件服务接口层 diff --git a/src/main/java/com/youlai/system/service/OssService.java b/src/main/java/com/youlai/boot/common/service/OssService.java similarity index 82% rename from src/main/java/com/youlai/system/service/OssService.java rename to src/main/java/com/youlai/boot/common/service/OssService.java index 04875d1a..9aa891b8 100644 --- a/src/main/java/com/youlai/system/service/OssService.java +++ b/src/main/java/com/youlai/boot/common/service/OssService.java @@ -1,6 +1,6 @@ -package com.youlai.system.service; +package com.youlai.boot.common.service; -import com.youlai.system.model.dto.FileInfo; +import com.youlai.boot.module.system.model.dto.FileInfo; import org.springframework.web.multipart.MultipartFile; /** diff --git a/src/main/java/com/youlai/system/service/SmsService.java b/src/main/java/com/youlai/boot/common/service/SmsService.java similarity index 92% rename from src/main/java/com/youlai/system/service/SmsService.java rename to src/main/java/com/youlai/boot/common/service/SmsService.java index 9a327eed..d838592a 100644 --- a/src/main/java/com/youlai/system/service/SmsService.java +++ b/src/main/java/com/youlai/boot/common/service/SmsService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service; +package com.youlai.boot.common.service; /** * 短信服务接口层 diff --git a/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java b/src/main/java/com/youlai/boot/common/service/impl/AliyunOssService.java similarity index 96% rename from src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java rename to src/main/java/com/youlai/boot/common/service/impl/AliyunOssService.java index 5062713f..e7e3dbf3 100644 --- a/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java +++ b/src/main/java/com/youlai/boot/common/service/impl/AliyunOssService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl.oss; +package com.youlai.boot.common.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -8,7 +8,7 @@ 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.system.model.dto.FileInfo; +import com.youlai.boot.module.system.model.dto.FileInfo; import com.youlai.system.service.OssService; import jakarta.annotation.PostConstruct; import lombok.Data; diff --git a/src/main/java/com/youlai/system/service/impl/sms/AliyunSmsService.java b/src/main/java/com/youlai/boot/common/service/impl/AliyunSmsService.java similarity index 96% rename from src/main/java/com/youlai/system/service/impl/sms/AliyunSmsService.java rename to src/main/java/com/youlai/boot/common/service/impl/AliyunSmsService.java index 2cd6533f..74c27e98 100644 --- a/src/main/java/com/youlai/system/service/impl/sms/AliyunSmsService.java +++ b/src/main/java/com/youlai/boot/common/service/impl/AliyunSmsService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl.sms; +package com.youlai.boot.common.service.impl; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -8,7 +8,7 @@ import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ServerException; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; -import com.youlai.system.config.property.AliyunSmsProperties; +import com.youlai.boot.config.property.AliyunSmsProperties; import com.youlai.system.service.SmsService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/mail/MailServiceImpl.java b/src/main/java/com/youlai/boot/common/service/impl/MailServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/system/service/impl/mail/MailServiceImpl.java rename to src/main/java/com/youlai/boot/common/service/impl/MailServiceImpl.java index a5a55e38..8ac14fac 100644 --- a/src/main/java/com/youlai/system/service/impl/mail/MailServiceImpl.java +++ b/src/main/java/com/youlai/boot/common/service/impl/MailServiceImpl.java @@ -1,6 +1,6 @@ -package com.youlai.system.service.impl.mail; +package com.youlai.boot.common.service.impl; -import com.youlai.system.config.property.MailProperties; +import com.youlai.boot.config.property.MailProperties; import com.youlai.system.service.MailService; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; diff --git a/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java b/src/main/java/com/youlai/boot/common/service/impl/MinioOssService.java similarity index 98% rename from src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java rename to src/main/java/com/youlai/boot/common/service/impl/MinioOssService.java index 00eb327a..f4921dbd 100644 --- a/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java +++ b/src/main/java/com/youlai/boot/common/service/impl/MinioOssService.java @@ -1,11 +1,11 @@ -package com.youlai.system.service.impl.oss; +package com.youlai.boot.common.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.system.model.dto.FileInfo; +import com.youlai.boot.module.system.model.dto.FileInfo; import com.youlai.system.service.OssService; import io.minio.*; import io.minio.errors.*; diff --git a/src/main/java/com/youlai/system/util/DateUtils.java b/src/main/java/com/youlai/boot/common/util/DateUtils.java similarity index 98% rename from src/main/java/com/youlai/system/util/DateUtils.java rename to src/main/java/com/youlai/boot/common/util/DateUtils.java index 167fce20..0a3c30a9 100644 --- a/src/main/java/com/youlai/system/util/DateUtils.java +++ b/src/main/java/com/youlai/boot/common/util/DateUtils.java @@ -1,5 +1,5 @@ -package com.youlai.system.util; +package com.youlai.boot.common.util; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; diff --git a/src/main/java/com/youlai/system/util/ExcelUtils.java b/src/main/java/com/youlai/boot/common/util/ExcelUtils.java similarity index 69% rename from src/main/java/com/youlai/system/util/ExcelUtils.java rename to src/main/java/com/youlai/boot/common/util/ExcelUtils.java index 14894baf..6ebaf950 100644 --- a/src/main/java/com/youlai/system/util/ExcelUtils.java +++ b/src/main/java/com/youlai/boot/common/util/ExcelUtils.java @@ -1,7 +1,7 @@ -package com.youlai.system.util; +package com.youlai.boot.common.util; import com.alibaba.excel.EasyExcel; -import com.youlai.system.plugin.easyexcel.MyAnalysisEventListener; +import com.youlai.boot.common.base.BaseAnalysisEventListener; import java.io.InputStream; @@ -13,7 +13,7 @@ import java.io.InputStream; */ public class ExcelUtils { - public static String importExcel(InputStream is, Class clazz, MyAnalysisEventListener listener) { + public static String importExcel(InputStream is, Class clazz, BaseAnalysisEventListener listener) { EasyExcel.read(is, clazz, listener).sheet().doRead(); return listener.getMsg(); } diff --git a/src/main/java/com/youlai/system/util/IPUtils.java b/src/main/java/com/youlai/boot/common/util/IPUtils.java similarity index 99% rename from src/main/java/com/youlai/system/util/IPUtils.java rename to src/main/java/com/youlai/boot/common/util/IPUtils.java index 2d77f90d..ae1480cc 100644 --- a/src/main/java/com/youlai/system/util/IPUtils.java +++ b/src/main/java/com/youlai/boot/common/util/IPUtils.java @@ -1,4 +1,4 @@ -package com.youlai.system.util; +package com.youlai.boot.common.util; import cn.hutool.core.util.StrUtil; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/youlai/system/util/ResponseUtils.java b/src/main/java/com/youlai/boot/common/util/ResponseUtils.java similarity index 92% rename from src/main/java/com/youlai/system/util/ResponseUtils.java rename to src/main/java/com/youlai/boot/common/util/ResponseUtils.java index 3bb84286..6ae77b87 100644 --- a/src/main/java/com/youlai/system/util/ResponseUtils.java +++ b/src/main/java/com/youlai/boot/common/util/ResponseUtils.java @@ -1,8 +1,8 @@ -package com.youlai.system.util; +package com.youlai.boot.common.util; import cn.hutool.json.JSONUtil; -import com.youlai.system.common.result.Result; -import com.youlai.system.common.result.ResultCode; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.common.result.ResultCode; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/youlai/system/config/CaptchaConfig.java b/src/main/java/com/youlai/boot/config/CaptchaConfig.java similarity index 94% rename from src/main/java/com/youlai/system/config/CaptchaConfig.java rename to src/main/java/com/youlai/boot/config/CaptchaConfig.java index dbdb5e27..36f709da 100644 --- a/src/main/java/com/youlai/system/config/CaptchaConfig.java +++ b/src/main/java/com/youlai/boot/config/CaptchaConfig.java @@ -1,9 +1,9 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.MathGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import com.youlai.system.config.property.CaptchaProperties; +import com.youlai.boot.config.property.CaptchaProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/system/config/CorsConfig.java b/src/main/java/com/youlai/boot/config/CorsConfig.java similarity index 97% rename from src/main/java/com/youlai/system/config/CorsConfig.java rename to src/main/java/com/youlai/boot/config/CorsConfig.java index 4d9fc035..ee3fc54e 100644 --- a/src/main/java/com/youlai/system/config/CorsConfig.java +++ b/src/main/java/com/youlai/boot/config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/youlai/system/config/MailConfig.java b/src/main/java/com/youlai/boot/config/MailConfig.java similarity index 95% rename from src/main/java/com/youlai/system/config/MailConfig.java rename to src/main/java/com/youlai/boot/config/MailConfig.java index a7d06cc4..9911e8d6 100644 --- a/src/main/java/com/youlai/system/config/MailConfig.java +++ b/src/main/java/com/youlai/boot/config/MailConfig.java @@ -1,6 +1,6 @@ -package com.youlai.system.config; +package com.youlai.boot.config; -import com.youlai.system.config.property.MailProperties; +import com.youlai.boot.config.property.MailProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/system/config/MybatisConfig.java b/src/main/java/com/youlai/boot/config/MybatisConfig.java similarity index 97% rename from src/main/java/com/youlai/system/config/MybatisConfig.java rename to src/main/java/com/youlai/boot/config/MybatisConfig.java index 4e34436d..586fb6b7 100644 --- a/src/main/java/com/youlai/system/config/MybatisConfig.java +++ b/src/main/java/com/youlai/boot/config/MybatisConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.config.GlobalConfig; diff --git a/src/main/java/com/youlai/system/config/RedisCacheConfig.java b/src/main/java/com/youlai/boot/config/RedisCacheConfig.java similarity index 98% rename from src/main/java/com/youlai/system/config/RedisCacheConfig.java rename to src/main/java/com/youlai/boot/config/RedisCacheConfig.java index 45fcb4d1..17b71038 100644 --- a/src/main/java/com/youlai/system/config/RedisCacheConfig.java +++ b/src/main/java/com/youlai/boot/config/RedisCacheConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import org.springframework.boot.autoconfigure.cache.CacheProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/main/java/com/youlai/system/config/RedisConfig.java b/src/main/java/com/youlai/boot/config/RedisConfig.java similarity index 97% rename from src/main/java/com/youlai/system/config/RedisConfig.java rename to src/main/java/com/youlai/boot/config/RedisConfig.java index 8e6bd888..bdb4fead 100644 --- a/src/main/java/com/youlai/system/config/RedisConfig.java +++ b/src/main/java/com/youlai/boot/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/system/config/SecurityConfig.java b/src/main/java/com/youlai/boot/config/SecurityConfig.java similarity index 85% rename from src/main/java/com/youlai/system/config/SecurityConfig.java rename to src/main/java/com/youlai/boot/config/SecurityConfig.java index 2aa483d2..f66e9e4e 100644 --- a/src/main/java/com/youlai/system/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/config/SecurityConfig.java @@ -1,15 +1,15 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.collection.CollectionUtil; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.config.property.SecurityProperties; -import com.youlai.system.filter.RedisRateLimiterFilter; -import com.youlai.system.security.exception.MyAccessDeniedHandler; -import com.youlai.system.security.exception.MyAuthenticationEntryPoint; -import com.youlai.system.filter.JwtValidationFilter; -import com.youlai.system.filter.CaptchaValidationFilter; -import com.youlai.system.service.SysConfigService; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.config.property.SecurityProperties; +import com.youlai.boot.framework.filter.RateLimiterFilter; +import com.youlai.boot.framework.security.exception.MyAccessDeniedHandler; +import com.youlai.boot.framework.security.exception.MyAuthenticationEntryPoint; +import com.youlai.boot.framework.security.filter.JwtValidationFilter; +import com.youlai.boot.framework.security.filter.CaptchaValidationFilter; +import com.youlai.boot.module.system.service.SysConfigService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -68,7 +68,7 @@ public class SecurityConfig { ; // 限流过滤器 - http.addFilterBefore(new RedisRateLimiterFilter(redisTemplate, sysConfigService), UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore(new RateLimiterFilter(redisTemplate, sysConfigService), UsernamePasswordAuthenticationFilter.class); // 验证码校验过滤器 http.addFilterBefore(new CaptchaValidationFilter(redisTemplate, codeGenerator), UsernamePasswordAuthenticationFilter.class); // JWT 校验过滤器 diff --git a/src/main/java/com/youlai/system/config/SwaggerConfig.java b/src/main/java/com/youlai/boot/config/SwaggerConfig.java similarity index 98% rename from src/main/java/com/youlai/system/config/SwaggerConfig.java rename to src/main/java/com/youlai/boot/config/SwaggerConfig.java index 95ccb7c5..829b59b6 100644 --- a/src/main/java/com/youlai/system/config/SwaggerConfig.java +++ b/src/main/java/com/youlai/boot/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/src/main/java/com/youlai/system/config/WebMvcConfig.java b/src/main/java/com/youlai/boot/config/WebMvcConfig.java similarity index 98% rename from src/main/java/com/youlai/system/config/WebMvcConfig.java rename to src/main/java/com/youlai/boot/config/WebMvcConfig.java index 6dee3948..6bf75f30 100644 --- a/src/main/java/com/youlai/system/config/WebMvcConfig.java +++ b/src/main/java/com/youlai/boot/config/WebMvcConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/youlai/system/config/WebSocketConfig.java b/src/main/java/com/youlai/boot/config/WebSocketConfig.java similarity index 95% rename from src/main/java/com/youlai/system/config/WebSocketConfig.java rename to src/main/java/com/youlai/boot/config/WebSocketConfig.java index 815b8841..ae416dc8 100644 --- a/src/main/java/com/youlai/system/config/WebSocketConfig.java +++ b/src/main/java/com/youlai/boot/config/WebSocketConfig.java @@ -1,16 +1,13 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import cn.hutool.core.util.StrUtil; import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.event.UserConnectionEvent; +import com.youlai.boot.module.system.event.UserConnectionEvent; import com.youlai.system.service.WebsocketService; -import groovy.lang.Lazy; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/com/youlai/system/config/XxlJobConfig.java b/src/main/java/com/youlai/boot/config/XxlJobConfig.java similarity index 98% rename from src/main/java/com/youlai/system/config/XxlJobConfig.java rename to src/main/java/com/youlai/boot/config/XxlJobConfig.java index a0f802ed..0852a6cc 100644 --- a/src/main/java/com/youlai/system/config/XxlJobConfig.java +++ b/src/main/java/com/youlai/boot/config/XxlJobConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/system/config/property/AliyunSmsProperties.java b/src/main/java/com/youlai/boot/config/property/AliyunSmsProperties.java similarity index 95% rename from src/main/java/com/youlai/system/config/property/AliyunSmsProperties.java rename to src/main/java/com/youlai/boot/config/property/AliyunSmsProperties.java index 80df9de2..05cf7b66 100644 --- a/src/main/java/com/youlai/system/config/property/AliyunSmsProperties.java +++ b/src/main/java/com/youlai/boot/config/property/AliyunSmsProperties.java @@ -1,4 +1,4 @@ -package com.youlai.system.config.property; +package com.youlai.boot.config.property; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/youlai/system/config/property/CaptchaProperties.java b/src/main/java/com/youlai/boot/config/property/CaptchaProperties.java similarity index 97% rename from src/main/java/com/youlai/system/config/property/CaptchaProperties.java rename to src/main/java/com/youlai/boot/config/property/CaptchaProperties.java index 6217679e..fae6c447 100644 --- a/src/main/java/com/youlai/system/config/property/CaptchaProperties.java +++ b/src/main/java/com/youlai/boot/config/property/CaptchaProperties.java @@ -1,4 +1,4 @@ -package com.youlai.system.config.property; +package com.youlai.boot.config.property; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/youlai/system/config/property/GeneratorProperties.java b/src/main/java/com/youlai/boot/config/property/GeneratorProperties.java similarity index 96% rename from src/main/java/com/youlai/system/config/property/GeneratorProperties.java rename to src/main/java/com/youlai/boot/config/property/GeneratorProperties.java index 76d92aa1..0f3261cd 100644 --- a/src/main/java/com/youlai/system/config/property/GeneratorProperties.java +++ b/src/main/java/com/youlai/boot/config/property/GeneratorProperties.java @@ -1,4 +1,4 @@ -package com.youlai.system.config.property; +package com.youlai.boot.config.property; import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.map.MapUtil; diff --git a/src/main/java/com/youlai/system/config/property/MailProperties.java b/src/main/java/com/youlai/boot/config/property/MailProperties.java similarity index 98% rename from src/main/java/com/youlai/system/config/property/MailProperties.java rename to src/main/java/com/youlai/boot/config/property/MailProperties.java index 77e3c230..976ff29c 100644 --- a/src/main/java/com/youlai/system/config/property/MailProperties.java +++ b/src/main/java/com/youlai/boot/config/property/MailProperties.java @@ -1,4 +1,4 @@ -package com.youlai.system.config.property; +package com.youlai.boot.config.property; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/youlai/system/config/property/SecurityProperties.java b/src/main/java/com/youlai/boot/config/property/SecurityProperties.java similarity index 93% rename from src/main/java/com/youlai/system/config/property/SecurityProperties.java rename to src/main/java/com/youlai/boot/config/property/SecurityProperties.java index b4ae91b1..04d97d6c 100644 --- a/src/main/java/com/youlai/system/config/property/SecurityProperties.java +++ b/src/main/java/com/youlai/boot/config/property/SecurityProperties.java @@ -1,4 +1,4 @@ -package com.youlai.system.config.property; +package com.youlai.boot.config.property; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/youlai/system/plugin/syslog/aspect/LogAspect.java b/src/main/java/com/youlai/boot/framework/aspect/LogAspect.java similarity index 86% rename from src/main/java/com/youlai/system/plugin/syslog/aspect/LogAspect.java rename to src/main/java/com/youlai/boot/framework/aspect/LogAspect.java index f103766c..74082a73 100644 --- a/src/main/java/com/youlai/system/plugin/syslog/aspect/LogAspect.java +++ b/src/main/java/com/youlai/boot/framework/aspect/LogAspect.java @@ -1,16 +1,16 @@ -package com.youlai.system.plugin.syslog.aspect; +package com.youlai.boot.framework.aspect; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.TimeInterval; import cn.hutool.core.util.StrUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.util.IPUtils; -import com.youlai.system.model.entity.SysLog; -import com.youlai.system.plugin.syslog.annotation.LogAnnotation; -import com.youlai.system.security.util.SecurityUtils; -import com.youlai.system.service.SysLogService; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.common.util.IPUtils; +import com.youlai.boot.module.system.model.entity.SysLog; +import com.youlai.boot.common.annotation.LogAnnotation; +import com.youlai.boot.framework.security.util.SecurityUtils; +import com.youlai.boot.module.system.service.SysLogService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -35,7 +35,7 @@ public class LogAspect { private final SysLogService logService; private final HttpServletRequest request; - @Pointcut("@annotation(com.youlai.system.plugin.syslog.annotation.LogAnnotation)") + @Pointcut("@annotation(com.youlai.boot.common.annotation.LogAnnotation)") public void logPointcut() { } diff --git a/src/main/java/com/youlai/system/plugin/norepeat/aspect/DuplicateSubmitAspect.java b/src/main/java/com/youlai/boot/framework/aspect/NoRepeatAspect.java similarity index 74% rename from src/main/java/com/youlai/system/plugin/norepeat/aspect/DuplicateSubmitAspect.java rename to src/main/java/com/youlai/boot/framework/aspect/NoRepeatAspect.java index 6f0d1d73..cfb4a4ea 100644 --- a/src/main/java/com/youlai/system/plugin/norepeat/aspect/DuplicateSubmitAspect.java +++ b/src/main/java/com/youlai/boot/framework/aspect/NoRepeatAspect.java @@ -1,13 +1,13 @@ -package com.youlai.system.plugin.norepeat.aspect; +package com.youlai.boot.framework.aspect; import cn.hutool.core.util.StrUtil; import cn.hutool.jwt.JWTUtil; import cn.hutool.jwt.RegisteredPayload; -import com.youlai.system.common.constant.RedisConstants; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.exception.BusinessException; -import com.youlai.system.common.result.ResultCode; -import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit; +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.exception.BusinessException; +import com.youlai.boot.common.annotation.NoRepeat; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,24 +34,24 @@ import java.util.concurrent.TimeUnit; @Component @Slf4j @RequiredArgsConstructor -public class DuplicateSubmitAspect { +public class NoRepeatAspect { private final RedissonClient redissonClient; /** * 防重复提交切点 */ - @Pointcut("@annotation(preventRepeatSubmit)") - public void preventDuplicateSubmitPointCut(PreventRepeatSubmit preventRepeatSubmit) { + @Pointcut("@annotation(noRepeat)") + public void preventDuplicateSubmitPointCut(NoRepeat noRepeat) { log.info("定义防重复提交切点"); } - @Around("preventDuplicateSubmitPointCut(preventRepeatSubmit)") - public Object doAround(ProceedingJoinPoint pjp, PreventRepeatSubmit preventRepeatSubmit) throws Throwable { + @Around("preventDuplicateSubmitPointCut(noRepeat)") + public Object doAround(ProceedingJoinPoint pjp, NoRepeat noRepeat) throws Throwable { String resubmitLockKey = generateResubmitLockKey(); if (resubmitLockKey != null) { - int expire = preventRepeatSubmit.expire(); // 防重提交锁过期时间 + int expire = noRepeat.expire(); // 防重提交锁过期时间 RLock lock = redissonClient.getLock(resubmitLockKey); boolean lockResult = lock.tryLock(0, expire, TimeUnit.SECONDS); // 获取锁失败，直接返回 false if (!lockResult) { diff --git a/src/main/java/com/youlai/system/filter/RedisRateLimiterFilter.java b/src/main/java/com/youlai/boot/framework/filter/RateLimiterFilter.java similarity index 84% rename from src/main/java/com/youlai/system/filter/RedisRateLimiterFilter.java rename to src/main/java/com/youlai/boot/framework/filter/RateLimiterFilter.java index 30ff59a0..3d80d284 100644 --- a/src/main/java/com/youlai/system/filter/RedisRateLimiterFilter.java +++ b/src/main/java/com/youlai/boot/framework/filter/RateLimiterFilter.java @@ -1,10 +1,10 @@ -package com.youlai.system.filter; +package com.youlai.boot.framework.filter; -import com.youlai.system.common.constant.RedisConstants; -import com.youlai.system.common.result.ResultCode; -import com.youlai.system.service.SysConfigService; -import com.youlai.system.util.IPUtils; -import com.youlai.system.util.ResponseUtils; +import com.youlai.boot.common.constant.RedisConstants; +import com.youlai.boot.common.result.ResultCode; +import com.youlai.boot.common.util.IPUtils; +import com.youlai.boot.common.util.ResponseUtils; +import com.youlai.boot.module.system.service.SysConfigService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit; * @since 2024/08/10 14:38 */ @Slf4j -public class RedisRateLimiterFilter extends OncePerRequestFilter { +public class RateLimiterFilter extends OncePerRequestFilter { private final RedisTemplate redisTemplate; private final SysConfigService sysConfigService; - public RedisRateLimiterFilter(RedisTemplate redisTemplate, SysConfigService sysConfigService) { + public RateLimiterFilter(RedisTemplate redisTemplate, SysConfigService sysConfigService) { this.redisTemplate = redisTemplate; this.sysConfigService = sysConfigService; } diff --git a/src/main/java/com/youlai/system/filter/RequestLogFilter.java b/src/main/java/com/youlai/boot/framework/filter/RequestLogFilter.java similarity index 95% rename from src/main/java/com/youlai/system/filter/RequestLogFilter.java rename to src/main/java/com/youlai/boot/framework/filter/RequestLogFilter.java index 0a968789..4a33b190 100644 --- a/src/main/java/com/youlai/system/filter/RequestLogFilter.java +++ b/src/main/java/com/youlai/boot/framework/filter/RequestLogFilter.java @@ -1,4 +1,4 @@ -package com.youlai.system.filter; +package com.youlai.boot.framework.filter; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/boot/framework/security/exception/MyAccessDeniedHandler.java similarity index 88% rename from src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java rename to src/main/java/com/youlai/boot/framework/security/exception/MyAccessDeniedHandler.java index 484b24ee..67df64a6 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java +++ b/src/main/java/com/youlai/boot/framework/security/exception/MyAccessDeniedHandler.java @@ -1,7 +1,7 @@ -package com.youlai.system.security.exception; +package com.youlai.boot.framework.security.exception; import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.boot.common.util.ResponseUtils; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/boot/framework/security/exception/MyAuthenticationEntryPoint.java similarity index 93% rename from src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java rename to src/main/java/com/youlai/boot/framework/security/exception/MyAuthenticationEntryPoint.java index 28552173..78d88ee3 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/boot/framework/security/exception/MyAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ -package com.youlai.system.security.exception; +package com.youlai.boot.framework.security.exception; import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.boot.common.util.ResponseUtils; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; diff --git a/src/main/java/com/youlai/system/filter/CaptchaValidationFilter.java b/src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java similarity index 92% rename from src/main/java/com/youlai/system/filter/CaptchaValidationFilter.java rename to src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java index 291570ba..5700fa05 100644 --- a/src/main/java/com/youlai/system/filter/CaptchaValidationFilter.java +++ b/src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java @@ -1,10 +1,10 @@ -package com.youlai.system.filter; +package com.youlai.boot.framework.security.filter; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.StrUtil; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.common.result.ResultCode; +import com.youlai.boot.common.util.ResponseUtils; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/youlai/system/filter/JwtValidationFilter.java b/src/main/java/com/youlai/boot/framework/security/filter/JwtValidationFilter.java similarity index 92% rename from src/main/java/com/youlai/system/filter/JwtValidationFilter.java rename to src/main/java/com/youlai/boot/framework/security/filter/JwtValidationFilter.java index b6aa64e0..c2f56e85 100644 --- a/src/main/java/com/youlai/system/filter/JwtValidationFilter.java +++ b/src/main/java/com/youlai/boot/framework/security/filter/JwtValidationFilter.java @@ -1,14 +1,14 @@ -package com.youlai.system.filter; +package com.youlai.boot.framework.security.filter; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.jwt.JWT; import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.common.result.ResultCode; -import com.youlai.system.security.util.JwtUtils; -import com.youlai.system.util.ResponseUtils; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.common.result.ResultCode; +import com.youlai.boot.framework.security.util.JwtUtils; +import com.youlai.boot.common.util.ResponseUtils; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/youlai/system/security/model/SysUserDetails.java b/src/main/java/com/youlai/boot/framework/security/model/SysUserDetails.java similarity index 95% rename from src/main/java/com/youlai/system/security/model/SysUserDetails.java rename to src/main/java/com/youlai/boot/framework/security/model/SysUserDetails.java index e6b36825..6c604b89 100644 --- a/src/main/java/com/youlai/system/security/model/SysUserDetails.java +++ b/src/main/java/com/youlai/boot/framework/security/model/SysUserDetails.java @@ -1,8 +1,8 @@ -package com.youlai.system.security.model; +package com.youlai.boot.framework.security.model; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import com.youlai.system.model.dto.UserAuthInfo; +import com.youlai.boot.module.system.model.dto.UserAuthInfo; import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/youlai/system/security/service/PermissionService.java b/src/main/java/com/youlai/boot/framework/security/service/PermissionService.java similarity index 96% rename from src/main/java/com/youlai/system/security/service/PermissionService.java rename to src/main/java/com/youlai/boot/framework/security/service/PermissionService.java index 7f6f4021..0b149970 100644 --- a/src/main/java/com/youlai/system/security/service/PermissionService.java +++ b/src/main/java/com/youlai/boot/framework/security/service/PermissionService.java @@ -1,9 +1,9 @@ -package com.youlai.system.security.service; +package com.youlai.boot.framework.security.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.security.util.SecurityUtils; +import com.youlai.boot.framework.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/system/security/service/SysUserDetailsService.java b/src/main/java/com/youlai/boot/framework/security/service/SysUserDetailsService.java similarity index 85% rename from src/main/java/com/youlai/system/security/service/SysUserDetailsService.java rename to src/main/java/com/youlai/boot/framework/security/service/SysUserDetailsService.java index 4dbb84ff..fa60bfc0 100644 --- a/src/main/java/com/youlai/system/security/service/SysUserDetailsService.java +++ b/src/main/java/com/youlai/boot/framework/security/service/SysUserDetailsService.java @@ -1,8 +1,8 @@ -package com.youlai.system.security.service; +package com.youlai.boot.framework.security.service; -import com.youlai.system.security.model.SysUserDetails; -import com.youlai.system.model.dto.UserAuthInfo; -import com.youlai.system.service.SysUserService; +import com.youlai.boot.framework.security.model.SysUserDetails; +import com.youlai.boot.module.system.model.dto.UserAuthInfo; +import com.youlai.boot.module.system.service.SysUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/youlai/system/security/util/JwtUtils.java b/src/main/java/com/youlai/boot/framework/security/util/JwtUtils.java similarity index 96% rename from src/main/java/com/youlai/system/security/util/JwtUtils.java rename to src/main/java/com/youlai/boot/framework/security/util/JwtUtils.java index 49cc845f..2b8ecf76 100644 --- a/src/main/java/com/youlai/system/security/util/JwtUtils.java +++ b/src/main/java/com/youlai/boot/framework/security/util/JwtUtils.java @@ -1,4 +1,4 @@ -package com.youlai.system.security.util; +package com.youlai.boot.framework.security.util; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; @@ -7,7 +7,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; import com.youlai.system.common.constant.JwtClaimConstants; -import com.youlai.system.security.model.SysUserDetails; +import com.youlai.boot.framework.security.model.SysUserDetails; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/youlai/system/security/util/SecurityUtils.java b/src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java similarity index 96% rename from src/main/java/com/youlai/system/security/util/SecurityUtils.java rename to src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java index 2b0550a1..b844c6ab 100644 --- a/src/main/java/com/youlai/system/security/util/SecurityUtils.java +++ b/src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java @@ -1,9 +1,9 @@ -package com.youlai.system.security.util; +package com.youlai.boot.framework.security.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.security.model.SysUserDetails; +import com.youlai.boot.framework.security.model.SysUserDetails; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/youlai/system/controller/GeneratorController.java b/src/main/java/com/youlai/boot/module/generator/controller/GeneratorController.java similarity index 90% rename from src/main/java/com/youlai/system/controller/GeneratorController.java rename to src/main/java/com/youlai/boot/module/generator/controller/GeneratorController.java index 7a5e5f5e..13df11d2 100644 --- a/src/main/java/com/youlai/system/controller/GeneratorController.java +++ b/src/main/java/com/youlai/boot/module/generator/controller/GeneratorController.java @@ -1,15 +1,15 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.generator.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.system.common.result.PageResult; import com.youlai.system.common.result.Result; -import com.youlai.system.config.property.GeneratorProperties; +import com.youlai.boot.config.property.GeneratorProperties; import com.youlai.system.enums.LogModuleEnum; -import com.youlai.system.model.form.GenConfigForm; -import com.youlai.system.model.query.TablePageQuery; -import com.youlai.system.model.vo.GeneratorPreviewVO; -import com.youlai.system.model.vo.TablePageVO; -import com.youlai.system.plugin.syslog.annotation.LogAnnotation; +import com.youlai.boot.module.system.model.form.GenConfigForm; +import com.youlai.boot.module.system.model.query.TablePageQuery; +import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.module.system.model.vo.TablePageVO; +import com.youlai.boot.common.annotation.LogAnnotation; import com.youlai.system.service.GeneratorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -18,7 +18,6 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.apache.commons.io.IOUtils; import org.springframework.web.bind.annotation.*; -import org.springframework.web.util.UriUtils; import java.io.IOException; import java.net.URLEncoder; diff --git a/src/main/java/com/youlai/system/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/module/generator/mapper/DatabaseMapper.java similarity index 57% rename from src/main/java/com/youlai/system/mapper/DatabaseMapper.java rename to src/main/java/com/youlai/boot/module/generator/mapper/DatabaseMapper.java index 0d66875f..1e876d51 100644 --- a/src/main/java/com/youlai/system/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/module/generator/mapper/DatabaseMapper.java @@ -1,12 +1,12 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.bo.ColumnMetaData; -import com.youlai.system.model.bo.TableMetaData; -import com.youlai.system.model.entity.SysDept; -import com.youlai.system.model.query.TablePageQuery; -import com.youlai.system.model.vo.TablePageVO; +import com.youlai.boot.module.system.model.bo.ColumnMetaData; +import com.youlai.boot.module.system.model.bo.TableMetaData; +import com.youlai.boot.module.system.model.entity.SysDept; +import com.youlai.boot.module.system.model.query.TablePageQuery; +import com.youlai.boot.module.system.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/system/mapper/GenConfigMapper.java b/src/main/java/com/youlai/boot/module/generator/mapper/GenConfigMapper.java similarity index 70% rename from src/main/java/com/youlai/system/mapper/GenConfigMapper.java rename to src/main/java/com/youlai/boot/module/generator/mapper/GenConfigMapper.java index a307568e..565dd54b 100644 --- a/src/main/java/com/youlai/system/mapper/GenConfigMapper.java +++ b/src/main/java/com/youlai/boot/module/generator/mapper/GenConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.GenConfig; +import com.youlai.boot.module.system.model.entity.GenConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java b/src/main/java/com/youlai/boot/module/generator/mapper/GenFieldConfigMapper.java similarity index 70% rename from src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java rename to src/main/java/com/youlai/boot/module/generator/mapper/GenFieldConfigMapper.java index 258d11a4..7b01fc08 100644 --- a/src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java +++ b/src/main/java/com/youlai/boot/module/generator/mapper/GenFieldConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.GenFieldConfig; +import com.youlai.boot.module.system.model.entity.GenFieldConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/system/service/GenConfigService.java b/src/main/java/com/youlai/boot/module/generator/service/GenConfigService.java similarity index 64% rename from src/main/java/com/youlai/system/service/GenConfigService.java rename to src/main/java/com/youlai/boot/module/generator/service/GenConfigService.java index 76156819..233698f1 100644 --- a/src/main/java/com/youlai/system/service/GenConfigService.java +++ b/src/main/java/com/youlai/boot/module/generator/service/GenConfigService.java @@ -1,7 +1,7 @@ -package com.youlai.system.service; +package com.youlai.boot.module.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.GenConfig; +import com.youlai.boot.module.system.model.entity.GenConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/system/service/GenFieldConfigService.java b/src/main/java/com/youlai/boot/module/generator/service/GenFieldConfigService.java similarity index 60% rename from src/main/java/com/youlai/system/service/GenFieldConfigService.java rename to src/main/java/com/youlai/boot/module/generator/service/GenFieldConfigService.java index c5007cb2..8aac3939 100644 --- a/src/main/java/com/youlai/system/service/GenFieldConfigService.java +++ b/src/main/java/com/youlai/boot/module/generator/service/GenFieldConfigService.java @@ -1,8 +1,7 @@ -package com.youlai.system.service; +package com.youlai.boot.module.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.GenConfig; -import com.youlai.system.model.entity.GenFieldConfig; +import com.youlai.boot.module.system.model.entity.GenFieldConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/system/service/GeneratorService.java b/src/main/java/com/youlai/boot/module/generator/service/GeneratorService.java similarity index 79% rename from src/main/java/com/youlai/system/service/GeneratorService.java rename to src/main/java/com/youlai/boot/module/generator/service/GeneratorService.java index 4fcb62e3..b2236666 100644 --- a/src/main/java/com/youlai/system/service/GeneratorService.java +++ b/src/main/java/com/youlai/boot/module/generator/service/GeneratorService.java @@ -1,10 +1,10 @@ -package com.youlai.system.service; +package com.youlai.boot.module.generator.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.form.GenConfigForm; -import com.youlai.system.model.query.TablePageQuery; -import com.youlai.system.model.vo.GeneratorPreviewVO; -import com.youlai.system.model.vo.TablePageVO; +import com.youlai.boot.module.system.model.form.GenConfigForm; +import com.youlai.boot.module.system.model.query.TablePageQuery; +import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.module.system.model.vo.TablePageVO; import java.util.List; diff --git a/src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java b/src/main/java/com/youlai/boot/module/generator/service/impl/GenConfigServiceImpl.java similarity index 70% rename from src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java rename to src/main/java/com/youlai/boot/module/generator/service/impl/GenConfigServiceImpl.java index 746cd496..51e2e503 100644 --- a/src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/generator/service/impl/GenConfigServiceImpl.java @@ -1,8 +1,8 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.generator.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.system.mapper.GenConfigMapper; -import com.youlai.system.model.entity.GenConfig; +import com.youlai.boot.module.generator.mapper.GenConfigMapper; +import com.youlai.boot.module.system.model.entity.GenConfig; import com.youlai.system.service.GenConfigService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/GenFieldConfigServiceImpl.java b/src/main/java/com/youlai/boot/module/generator/service/impl/GenFieldConfigServiceImpl.java similarity index 71% rename from src/main/java/com/youlai/system/service/impl/GenFieldConfigServiceImpl.java rename to src/main/java/com/youlai/boot/module/generator/service/impl/GenFieldConfigServiceImpl.java index 76b7c27d..80b960bf 100644 --- a/src/main/java/com/youlai/system/service/impl/GenFieldConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/generator/service/impl/GenFieldConfigServiceImpl.java @@ -1,8 +1,8 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.generator.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.system.mapper.GenFieldConfigMapper; -import com.youlai.system.model.entity.GenFieldConfig; +import com.youlai.boot.module.generator.mapper.GenFieldConfigMapper; +import com.youlai.boot.module.system.model.entity.GenFieldConfig; import com.youlai.system.service.GenFieldConfigService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/boot/module/generator/service/impl/GeneratorServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java rename to src/main/java/com/youlai/boot/module/generator/service/impl/GeneratorServiceImpl.java index 1990707b..eb4b1a5d 100644 --- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/generator/service/impl/GeneratorServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.generator.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; @@ -12,21 +12,21 @@ import cn.hutool.extra.template.TemplateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.system.SystemApplication; -import com.youlai.system.config.property.GeneratorProperties; -import com.youlai.system.converter.GenConfigConverter; +import com.youlai.boot.config.property.GeneratorProperties; +import com.youlai.boot.module.system.converter.GenConfigConverter; import com.youlai.system.enums.FormTypeEnum; import com.youlai.system.enums.JavaTypeEnum; import com.youlai.system.enums.QueryTypeEnum; -import com.youlai.system.exception.BusinessException; -import com.youlai.system.mapper.DatabaseMapper; -import com.youlai.system.model.bo.ColumnMetaData; -import com.youlai.system.model.bo.TableMetaData; -import com.youlai.system.model.entity.GenConfig; -import com.youlai.system.model.entity.GenFieldConfig; -import com.youlai.system.model.form.GenConfigForm; -import com.youlai.system.model.query.TablePageQuery; -import com.youlai.system.model.vo.GeneratorPreviewVO; -import com.youlai.system.model.vo.TablePageVO; +import com.youlai.boot.common.exception.BusinessException; +import com.youlai.boot.module.generator.mapper.DatabaseMapper; +import com.youlai.boot.module.system.model.bo.ColumnMetaData; +import com.youlai.boot.module.system.model.bo.TableMetaData; +import com.youlai.boot.module.system.model.entity.GenConfig; +import com.youlai.boot.module.system.model.entity.GenFieldConfig; +import com.youlai.boot.module.system.model.form.GenConfigForm; +import com.youlai.boot.module.system.model.query.TablePageQuery; +import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.module.system.model.vo.TablePageVO; import com.youlai.system.service.GeneratorService; import com.youlai.system.service.GenConfigService; import com.youlai.system.service.GenFieldConfigService; @@ -40,7 +40,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.*; -import java.util.stream.Collectors; import java.util.zip.ZipOutputStream; diff --git a/src/main/java/com/youlai/system/controller/AuthController.java b/src/main/java/com/youlai/boot/module/system/controller/AuthController.java similarity index 87% rename from src/main/java/com/youlai/system/controller/AuthController.java rename to src/main/java/com/youlai/boot/module/system/controller/AuthController.java index 51685c32..3b9eedc7 100644 --- a/src/main/java/com/youlai/system/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/AuthController.java @@ -1,10 +1,10 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.youlai.system.enums.LogModuleEnum; import com.youlai.system.common.result.Result; -import com.youlai.system.model.dto.CaptchaResult; -import com.youlai.system.model.dto.LoginResult; -import com.youlai.system.plugin.syslog.annotation.LogAnnotation; +import com.youlai.boot.module.system.model.dto.CaptchaResult; +import com.youlai.boot.module.system.model.dto.LoginResult; +import com.youlai.boot.common.annotation.LogAnnotation; import com.youlai.system.service.AuthService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/youlai/system/controller/FileController.java b/src/main/java/com/youlai/boot/module/system/controller/FileController.java similarity index 93% rename from src/main/java/com/youlai/system/controller/FileController.java rename to src/main/java/com/youlai/boot/module/system/controller/FileController.java index e641abe1..ea28d16a 100644 --- a/src/main/java/com/youlai/system/controller/FileController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/FileController.java @@ -1,7 +1,7 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.youlai.system.common.result.Result; -import com.youlai.system.model.dto.FileInfo; +import com.youlai.boot.module.system.model.dto.FileInfo; import com.youlai.system.service.OssService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; diff --git a/src/main/java/com/youlai/system/controller/SysConfigController.java b/src/main/java/com/youlai/boot/module/system/controller/SysConfigController.java similarity index 86% rename from src/main/java/com/youlai/system/controller/SysConfigController.java rename to src/main/java/com/youlai/boot/module/system/controller/SysConfigController.java index dfe88769..aebe35f0 100644 --- a/src/main/java/com/youlai/system/controller/SysConfigController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/SysConfigController.java @@ -1,12 +1,12 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.youlai.system.common.result.PageResult; -import com.youlai.system.common.result.Result; -import com.youlai.system.model.form.ConfigForm; -import com.youlai.system.model.query.ConfigPageQuery; -import com.youlai.system.model.vo.ConfigVO; -import com.youlai.system.service.SysConfigService; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.module.system.model.form.ConfigForm; +import com.youlai.boot.module.system.model.query.ConfigPageQuery; +import com.youlai.boot.module.system.model.vo.ConfigVO; +import com.youlai.boot.module.system.service.SysConfigService; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/system/controller/SysDeptController.java b/src/main/java/com/youlai/boot/module/system/controller/SysDeptController.java similarity index 88% rename from src/main/java/com/youlai/system/controller/SysDeptController.java rename to src/main/java/com/youlai/boot/module/system/controller/SysDeptController.java index 6aa9d5a8..b05d5712 100644 --- a/src/main/java/com/youlai/system/controller/SysDeptController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/SysDeptController.java @@ -1,13 +1,13 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.youlai.system.enums.LogModuleEnum; -import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit; +import com.youlai.boot.common.annotation.NoRepeat; import com.youlai.system.common.model.Option; import com.youlai.system.common.result.Result; -import com.youlai.system.model.form.DeptForm; -import com.youlai.system.model.query.DeptQuery; -import com.youlai.system.model.vo.DeptVO; -import com.youlai.system.plugin.syslog.annotation.LogAnnotation; +import com.youlai.boot.module.system.model.form.DeptForm; +import com.youlai.boot.module.system.model.query.DeptQuery; +import com.youlai.boot.module.system.model.vo.DeptVO; +import com.youlai.boot.common.annotation.LogAnnotation; import com.youlai.system.service.SysDeptService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -53,7 +53,7 @@ public class SysDeptController { @Operation(summary = "新增部门") @PostMapping @PreAuthorize("@ss.hasPerm('sys:dept:add')") - @PreventRepeatSubmit + @NoRepeat public Result saveDept( @Valid @RequestBody DeptForm formData ) { diff --git a/src/main/java/com/youlai/system/controller/SysDictController.java b/src/main/java/com/youlai/boot/module/system/controller/SysDictController.java similarity index 89% rename from src/main/java/com/youlai/system/controller/SysDictController.java rename to src/main/java/com/youlai/boot/module/system/controller/SysDictController.java index 0023f049..182b8f54 100644 --- a/src/main/java/com/youlai/system/controller/SysDictController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/SysDictController.java @@ -1,15 +1,15 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.system.common.model.Option; import com.youlai.system.common.result.PageResult; import com.youlai.system.common.result.Result; import com.youlai.system.enums.LogModuleEnum; -import com.youlai.system.model.query.DictPageQuery; -import com.youlai.system.model.vo.DictPageVO; -import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit; -import com.youlai.system.model.form.DictForm; -import com.youlai.system.plugin.syslog.annotation.LogAnnotation; +import com.youlai.boot.module.system.model.query.DictPageQuery; +import com.youlai.boot.module.system.model.vo.DictPageVO; +import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.module.system.model.form.DictForm; +import com.youlai.boot.common.annotation.LogAnnotation; import com.youlai.system.service.SysDictService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -72,7 +72,7 @@ public class SysDictController { @Operation(summary = "新增字典") @PostMapping @PreAuthorize("@ss.hasPerm('sys:dict:add')") - @PreventRepeatSubmit + @NoRepeat public Result saveDict(@RequestBody DictForm formData) { boolean result = dictService.saveDict(formData); return Result.judge(result); diff --git a/src/main/java/com/youlai/system/controller/SysLogController.java b/src/main/java/com/youlai/boot/module/system/controller/SysLogController.java similarity index 86% rename from src/main/java/com/youlai/system/controller/SysLogController.java rename to src/main/java/com/youlai/boot/module/system/controller/SysLogController.java index fede963b..0a0577a8 100644 --- a/src/main/java/com/youlai/system/controller/SysLogController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/SysLogController.java @@ -1,12 +1,12 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.system.common.result.PageResult; import com.youlai.system.common.result.Result; -import com.youlai.system.model.query.LogPageQuery; -import com.youlai.system.model.vo.LogPageVO; -import com.youlai.system.model.vo.VisitStatsVO; -import com.youlai.system.model.vo.VisitTrendVO; +import com.youlai.boot.module.system.model.query.LogPageQuery; +import com.youlai.boot.module.system.model.vo.LogPageVO; +import com.youlai.boot.module.system.model.vo.VisitStatsVO; +import com.youlai.boot.module.system.model.vo.VisitTrendVO; import com.youlai.system.service.SysLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/youlai/system/controller/SysMenuController.java b/src/main/java/com/youlai/boot/module/system/controller/SysMenuController.java similarity index 88% rename from src/main/java/com/youlai/system/controller/SysMenuController.java rename to src/main/java/com/youlai/boot/module/system/controller/SysMenuController.java index fb558cca..d149eeb5 100644 --- a/src/main/java/com/youlai/system/controller/SysMenuController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/SysMenuController.java @@ -1,15 +1,15 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.youlai.system.common.result.Result; import com.youlai.system.enums.LogModuleEnum; -import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit; -import com.youlai.system.model.form.MenuForm; -import com.youlai.system.model.query.MenuQuery; -import com.youlai.system.model.vo.MenuVO; +import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.module.system.model.form.MenuForm; +import com.youlai.boot.module.system.model.query.MenuQuery; +import com.youlai.boot.module.system.model.vo.MenuVO; import com.youlai.system.common.model.Option; -import com.youlai.system.model.vo.RouteVO; -import com.youlai.system.plugin.syslog.annotation.LogAnnotation; -import com.youlai.system.security.util.SecurityUtils; +import com.youlai.boot.module.system.model.vo.RouteVO; +import com.youlai.boot.common.annotation.LogAnnotation; +import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.system.service.SysMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -75,7 +75,7 @@ public class SysMenuController { @Operation(summary = "新增菜单") @PostMapping @PreAuthorize("@ss.hasPerm('sys:menu:add')") - @PreventRepeatSubmit + @NoRepeat public Result addMenu(@RequestBody MenuForm menuForm) { boolean result = menuService.saveMenu(menuForm); return Result.judge(result); diff --git a/src/main/java/com/youlai/system/controller/SysRoleController.java b/src/main/java/com/youlai/boot/module/system/controller/SysRoleController.java similarity index 91% rename from src/main/java/com/youlai/system/controller/SysRoleController.java rename to src/main/java/com/youlai/boot/module/system/controller/SysRoleController.java index 61e8590b..d9e20372 100644 --- a/src/main/java/com/youlai/system/controller/SysRoleController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/SysRoleController.java @@ -1,15 +1,15 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.system.enums.LogModuleEnum; -import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit; +import com.youlai.boot.common.annotation.NoRepeat; import com.youlai.system.common.model.Option; import com.youlai.system.common.result.PageResult; import com.youlai.system.common.result.Result; -import com.youlai.system.model.form.RoleForm; -import com.youlai.system.model.query.RolePageQuery; -import com.youlai.system.model.vo.RolePageVO; -import com.youlai.system.plugin.syslog.annotation.LogAnnotation; +import com.youlai.boot.module.system.model.form.RoleForm; +import com.youlai.boot.module.system.model.query.RolePageQuery; +import com.youlai.boot.module.system.model.vo.RolePageVO; +import com.youlai.boot.common.annotation.LogAnnotation; import com.youlai.system.service.SysRoleService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -57,7 +57,7 @@ public class SysRoleController { @Operation(summary = "新增角色") @PostMapping @PreAuthorize("@ss.hasPerm('sys:role:add')") - @PreventRepeatSubmit + @NoRepeat public Result addRole(@Valid @RequestBody RoleForm roleForm) { boolean result = roleService.saveRole(roleForm); return Result.judge(result); diff --git a/src/main/java/com/youlai/system/controller/SysUserController.java b/src/main/java/com/youlai/boot/module/system/controller/SysUserController.java similarity index 90% rename from src/main/java/com/youlai/system/controller/SysUserController.java rename to src/main/java/com/youlai/boot/module/system/controller/SysUserController.java index 02b47440..628f5cf4 100644 --- a/src/main/java/com/youlai/system/controller/SysUserController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/SysUserController.java @@ -1,26 +1,27 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.youlai.boot.module.system.model.form.*; +import com.youlai.boot.system.model.form.*; import com.youlai.system.common.result.PageResult; import com.youlai.system.common.result.Result; import com.youlai.system.enums.ContactType; -import com.youlai.system.model.form.*; -import com.youlai.system.model.vo.UserProfileVO; -import com.youlai.system.security.util.SecurityUtils; -import com.youlai.system.util.ExcelUtils; +import com.youlai.boot.module.system.model.vo.UserProfileVO; +import com.youlai.boot.framework.security.util.SecurityUtils; +import com.youlai.boot.common.util.ExcelUtils; import com.youlai.system.enums.LogModuleEnum; -import com.youlai.system.model.dto.UserImportDTO; -import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit; -import com.youlai.system.plugin.easyexcel.UserImportListener; -import com.youlai.system.model.entity.SysUser; -import com.youlai.system.model.query.UserPageQuery; -import com.youlai.system.model.dto.UserExportDTO; -import com.youlai.system.model.vo.UserInfoVO; -import com.youlai.system.model.vo.UserPageVO; -import com.youlai.system.plugin.syslog.annotation.LogAnnotation; +import com.youlai.boot.module.system.model.dto.UserImportDTO; +import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.module.system.listener.UserImportListener; +import com.youlai.boot.module.system.model.entity.SysUser; +import com.youlai.boot.module.system.model.query.UserPageQuery; +import com.youlai.boot.module.system.model.dto.UserExportDTO; +import com.youlai.boot.module.system.model.vo.UserInfoVO; +import com.youlai.boot.module.system.model.vo.UserPageVO; +import com.youlai.boot.common.annotation.LogAnnotation; import com.youlai.system.service.SysUserService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -69,7 +70,7 @@ public class SysUserController { @Operation(summary = "新增用户") @PostMapping @PreAuthorize("@ss.hasPerm('sys:user:add')") - @PreventRepeatSubmit + @NoRepeat public Result saveUser( @RequestBody @Valid UserForm userForm ) { diff --git a/src/main/java/com/youlai/system/controller/WebsocketController.java b/src/main/java/com/youlai/boot/module/system/controller/WebsocketController.java similarity index 94% rename from src/main/java/com/youlai/system/controller/WebsocketController.java rename to src/main/java/com/youlai/boot/module/system/controller/WebsocketController.java index 1e082faa..50d17238 100644 --- a/src/main/java/com/youlai/system/controller/WebsocketController.java +++ b/src/main/java/com/youlai/boot/module/system/controller/WebsocketController.java @@ -1,6 +1,6 @@ -package com.youlai.system.controller; +package com.youlai.boot.module.system.controller; -import com.youlai.system.model.dto.ChatMessage; +import com.youlai.boot.module.system.model.dto.ChatMessage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.handler.annotation.DestinationVariable; diff --git a/src/main/java/com/youlai/system/converter/SysConfigConverter.java b/src/main/java/com/youlai/boot/module/system/converter/ConfigConverter.java similarity index 58% rename from src/main/java/com/youlai/system/converter/SysConfigConverter.java rename to src/main/java/com/youlai/boot/module/system/converter/ConfigConverter.java index ad7d9781..5ea1660a 100644 --- a/src/main/java/com/youlai/system/converter/SysConfigConverter.java +++ b/src/main/java/com/youlai/boot/module/system/converter/ConfigConverter.java @@ -1,9 +1,9 @@ -package com.youlai.system.converter; +package com.youlai.boot.module.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.entity.SysConfig; -import com.youlai.system.model.form.ConfigForm; -import com.youlai.system.model.vo.ConfigVO; +import com.youlai.boot.module.system.model.entity.SysConfig; +import com.youlai.boot.module.system.model.vo.ConfigVO; +import com.youlai.boot.module.system.model.form.ConfigForm; import org.mapstruct.Mapper; /** @@ -13,7 +13,7 @@ import org.mapstruct.Mapper; * @since 2024-7-29 11:42:49 */ @Mapper(componentModel = "spring") -public interface SysConfigConverter { +public interface ConfigConverter { Page toPageVo(Page page); diff --git a/src/main/java/com/youlai/system/converter/DeptConverter.java b/src/main/java/com/youlai/boot/module/system/converter/DeptConverter.java similarity index 57% rename from src/main/java/com/youlai/system/converter/DeptConverter.java rename to src/main/java/com/youlai/boot/module/system/converter/DeptConverter.java index 83feca8c..dcc3c438 100644 --- a/src/main/java/com/youlai/system/converter/DeptConverter.java +++ b/src/main/java/com/youlai/boot/module/system/converter/DeptConverter.java @@ -1,8 +1,8 @@ -package com.youlai.system.converter; +package com.youlai.boot.module.system.converter; -import com.youlai.system.model.entity.SysDept; -import com.youlai.system.model.form.DeptForm; -import com.youlai.system.model.vo.DeptVO; +import com.youlai.boot.module.system.model.entity.SysDept; +import com.youlai.boot.module.system.model.vo.DeptVO; +import com.youlai.boot.module.system.model.form.DeptForm; import org.mapstruct.Mapper; /** diff --git a/src/main/java/com/youlai/system/converter/DictConverter.java b/src/main/java/com/youlai/boot/module/system/converter/DictConverter.java similarity index 62% rename from src/main/java/com/youlai/system/converter/DictConverter.java rename to src/main/java/com/youlai/boot/module/system/converter/DictConverter.java index 870b3d10..666acb75 100644 --- a/src/main/java/com/youlai/system/converter/DictConverter.java +++ b/src/main/java/com/youlai/boot/module/system/converter/DictConverter.java @@ -1,9 +1,9 @@ -package com.youlai.system.converter; +package com.youlai.boot.module.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.entity.SysDict; -import com.youlai.system.model.form.DictForm; -import com.youlai.system.model.vo.DictPageVO; +import com.youlai.boot.module.system.model.entity.SysDict; +import com.youlai.boot.module.system.model.vo.DictPageVO; +import com.youlai.boot.module.system.model.form.DictForm; import org.mapstruct.Mapper; /** diff --git a/src/main/java/com/youlai/system/converter/DictItemConverter.java b/src/main/java/com/youlai/boot/module/system/converter/DictItemConverter.java similarity index 80% rename from src/main/java/com/youlai/system/converter/DictItemConverter.java rename to src/main/java/com/youlai/boot/module/system/converter/DictItemConverter.java index ac7af999..dda7fd43 100644 --- a/src/main/java/com/youlai/system/converter/DictItemConverter.java +++ b/src/main/java/com/youlai/boot/module/system/converter/DictItemConverter.java @@ -1,10 +1,10 @@ -package com.youlai.system.converter; +package com.youlai.boot.module.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.boot.module.system.model.entity.SysDictItem; +import com.youlai.boot.module.system.model.vo.DictPageVO; import com.youlai.system.common.model.Option; -import com.youlai.system.model.entity.SysDictItem; -import com.youlai.system.model.form.DictForm; -import com.youlai.system.model.vo.DictPageVO; +import com.youlai.boot.module.system.model.form.DictForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; diff --git a/src/main/java/com/youlai/system/converter/GenConfigConverter.java b/src/main/java/com/youlai/boot/module/system/converter/GenConfigConverter.java similarity index 83% rename from src/main/java/com/youlai/system/converter/GenConfigConverter.java rename to src/main/java/com/youlai/boot/module/system/converter/GenConfigConverter.java index 72454b14..4d59fbc7 100644 --- a/src/main/java/com/youlai/system/converter/GenConfigConverter.java +++ b/src/main/java/com/youlai/boot/module/system/converter/GenConfigConverter.java @@ -1,8 +1,8 @@ -package com.youlai.system.converter; +package com.youlai.boot.module.system.converter; -import com.youlai.system.model.entity.GenConfig; -import com.youlai.system.model.entity.GenFieldConfig; -import com.youlai.system.model.form.GenConfigForm; +import com.youlai.boot.module.system.model.entity.GenConfig; +import com.youlai.boot.module.system.model.entity.GenFieldConfig; +import com.youlai.boot.module.system.model.form.GenConfigForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/system/converter/MenuConverter.java b/src/main/java/com/youlai/boot/module/system/converter/MenuConverter.java similarity index 65% rename from src/main/java/com/youlai/system/converter/MenuConverter.java rename to src/main/java/com/youlai/boot/module/system/converter/MenuConverter.java index c5c987a0..68a32c86 100644 --- a/src/main/java/com/youlai/system/converter/MenuConverter.java +++ b/src/main/java/com/youlai/boot/module/system/converter/MenuConverter.java @@ -1,8 +1,8 @@ -package com.youlai.system.converter; +package com.youlai.boot.module.system.converter; -import com.youlai.system.model.entity.SysMenu; -import com.youlai.system.model.form.MenuForm; -import com.youlai.system.model.vo.MenuVO; +import com.youlai.boot.module.system.model.entity.SysMenu; +import com.youlai.boot.module.system.model.vo.MenuVO; +import com.youlai.boot.module.system.model.form.MenuForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/system/converter/RoleConverter.java b/src/main/java/com/youlai/boot/module/system/converter/RoleConverter.java similarity index 76% rename from src/main/java/com/youlai/system/converter/RoleConverter.java rename to src/main/java/com/youlai/boot/module/system/converter/RoleConverter.java index 0a86a3a4..98366b03 100644 --- a/src/main/java/com/youlai/system/converter/RoleConverter.java +++ b/src/main/java/com/youlai/boot/module/system/converter/RoleConverter.java @@ -1,10 +1,10 @@ -package com.youlai.system.converter; +package com.youlai.boot.module.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.boot.module.system.model.entity.SysRole; +import com.youlai.boot.module.system.model.vo.RolePageVO; import com.youlai.system.common.model.Option; -import com.youlai.system.model.entity.SysRole; -import com.youlai.system.model.form.RoleForm; -import com.youlai.system.model.vo.RolePageVO; +import com.youlai.boot.module.system.model.form.RoleForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; diff --git a/src/main/java/com/youlai/system/converter/UserConverter.java b/src/main/java/com/youlai/boot/module/system/converter/UserConverter.java similarity index 58% rename from src/main/java/com/youlai/system/converter/UserConverter.java rename to src/main/java/com/youlai/boot/module/system/converter/UserConverter.java index b187c9ec..2771ec00 100644 --- a/src/main/java/com/youlai/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/boot/module/system/converter/UserConverter.java @@ -1,14 +1,14 @@ -package com.youlai.system.converter; +package com.youlai.boot.module.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.bo.UserBO; -import com.youlai.system.model.entity.SysUser; -import com.youlai.system.model.form.UserForm; -import com.youlai.system.model.dto.UserImportDTO; -import com.youlai.system.model.form.UserProfileForm; -import com.youlai.system.model.vo.UserInfoVO; -import com.youlai.system.model.vo.UserPageVO; -import com.youlai.system.model.vo.UserProfileVO; +import com.youlai.boot.module.system.model.entity.SysUser; +import com.youlai.boot.module.system.model.vo.UserInfoVO; +import com.youlai.boot.module.system.model.vo.UserPageVO; +import com.youlai.boot.module.system.model.vo.UserProfileVO; +import com.youlai.boot.module.system.model.bo.UserBO; +import com.youlai.boot.module.system.model.form.UserForm; +import com.youlai.boot.module.system.model.dto.UserImportDTO; +import com.youlai.boot.module.system.model.form.UserProfileForm; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -24,7 +24,7 @@ import org.mapstruct.Mappings; public interface UserConverter { @Mappings({ - @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.system.enums.GenderEnum.class))") + @Mapping(target = "genderLabel", expression = "java(com.youlai.boot.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.boot.common.enums.GenderEnum.class))") }) UserPageVO toPageVo(UserBO bo); diff --git a/src/main/java/com/youlai/system/event/UserConnectionEvent.java b/src/main/java/com/youlai/boot/module/system/event/UserConnectionEvent.java similarity index 89% rename from src/main/java/com/youlai/system/event/UserConnectionEvent.java rename to src/main/java/com/youlai/boot/module/system/event/UserConnectionEvent.java index c381a87b..4aaeb32a 100644 --- a/src/main/java/com/youlai/system/event/UserConnectionEvent.java +++ b/src/main/java/com/youlai/boot/module/system/event/UserConnectionEvent.java @@ -1,4 +1,4 @@ -package com.youlai.system.event; +package com.youlai.boot.module.system.event; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java b/src/main/java/com/youlai/boot/module/system/handler/XxlJobSampleHandler.java similarity index 88% rename from src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java rename to src/main/java/com/youlai/boot/module/system/handler/XxlJobSampleHandler.java index 91dfb768..970b55de 100644 --- a/src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java +++ b/src/main/java/com/youlai/boot/module/system/handler/XxlJobSampleHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.xxljob; +package com.youlai.boot.module.system.handler; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java b/src/main/java/com/youlai/boot/module/system/listener/UserImportListener.java similarity index 92% rename from src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java rename to src/main/java/com/youlai/boot/module/system/listener/UserImportListener.java index 63036c08..af1bc365 100644 --- a/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java +++ b/src/main/java/com/youlai/boot/module/system/listener/UserImportListener.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.easyexcel; +package com.youlai.boot.module.system.listener; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Validator; @@ -7,16 +7,17 @@ import cn.hutool.extra.spring.SpringUtil; import cn.hutool.json.JSONUtil; import com.alibaba.excel.context.AnalysisContext; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.youlai.boot.common.base.BaseAnalysisEventListener; +import com.youlai.boot.module.system.model.entity.SysDept; +import com.youlai.boot.module.system.model.entity.SysRole; +import com.youlai.boot.module.system.model.entity.SysUser; +import com.youlai.boot.module.system.model.entity.SysUserRole; import com.youlai.system.common.base.IBaseEnum; import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.enums.GenderEnum; import com.youlai.system.enums.StatusEnum; -import com.youlai.system.converter.UserConverter; -import com.youlai.system.model.dto.UserImportDTO; -import com.youlai.system.model.entity.SysDept; -import com.youlai.system.model.entity.SysRole; -import com.youlai.system.model.entity.SysUser; -import com.youlai.system.model.entity.SysUserRole; +import com.youlai.boot.module.system.converter.UserConverter; +import com.youlai.boot.module.system.model.dto.UserImportDTO; import com.youlai.system.service.SysDeptService; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; @@ -36,7 +37,7 @@ import java.util.stream.Collectors; * @since 2022/4/10 */ @Slf4j -public class UserImportListener extends MyAnalysisEventListener { +public class UserImportListener extends BaseAnalysisEventListener { // 有效条数 diff --git a/src/main/java/com/youlai/system/mapper/SysConfigMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysConfigMapper.java similarity index 70% rename from src/main/java/com/youlai/system/mapper/SysConfigMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysConfigMapper.java index 60bbd289..ad0d18f1 100644 --- a/src/main/java/com/youlai/system/mapper/SysConfigMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysConfigMapper.java @@ -1,8 +1,8 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.youlai.boot.module.system.model.entity.SysConfig; import org.apache.ibatis.annotations.Mapper; -import com.youlai.system.model.entity.SysConfig; /** * 系统配置 访问层 diff --git a/src/main/java/com/youlai/system/mapper/SysDeptMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysDeptMapper.java similarity index 75% rename from src/main/java/com/youlai/system/mapper/SysDeptMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysDeptMapper.java index 4cfc1b82..6288c4db 100644 --- a/src/main/java/com/youlai/system/mapper/SysDeptMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysDeptMapper.java @@ -1,10 +1,10 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.youlai.system.plugin.mybatis.annotation.DataPermission; -import com.youlai.system.model.entity.SysDept; +import com.youlai.boot.common.annotation.DataPermission; +import com.youlai.boot.module.system.model.entity.SysDept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/youlai/system/mapper/SysDictItemMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysDictItemMapper.java similarity index 70% rename from src/main/java/com/youlai/system/mapper/SysDictItemMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysDictItemMapper.java index 387f1fdb..d1caa414 100644 --- a/src/main/java/com/youlai/system/mapper/SysDictItemMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysDictItemMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.SysDictItem; +import com.youlai.boot.module.system.model.entity.SysDictItem; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/system/mapper/SysDictMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysDictMapper.java similarity index 70% rename from src/main/java/com/youlai/system/mapper/SysDictMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysDictMapper.java index 2565b95c..173eb863 100644 --- a/src/main/java/com/youlai/system/mapper/SysDictMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysDictMapper.java @@ -1,10 +1,10 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.entity.SysDict; -import com.youlai.system.model.query.DictPageQuery; -import com.youlai.system.model.vo.DictPageVO; +import com.youlai.boot.module.system.model.entity.SysDict; +import com.youlai.boot.module.system.model.query.DictPageQuery; +import com.youlai.boot.module.system.model.vo.DictPageVO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/system/mapper/SysLogMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysLogMapper.java similarity index 77% rename from src/main/java/com/youlai/system/mapper/SysLogMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysLogMapper.java index d0155dba..e99ee70a 100644 --- a/src/main/java/com/youlai/system/mapper/SysLogMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysLogMapper.java @@ -1,12 +1,12 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.bo.VisitCount; -import com.youlai.system.model.entity.SysLog; +import com.youlai.boot.module.system.model.bo.VisitCount; +import com.youlai.boot.module.system.model.entity.SysLog; +import com.youlai.boot.module.system.model.query.LogPageQuery; +import com.youlai.boot.module.system.model.vo.LogPageVO; +import com.youlai.boot.module.system.model.vo.VisitStatsVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.query.LogPageQuery; -import com.youlai.system.model.vo.LogPageVO; -import com.youlai.system.model.vo.VisitStatsVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysMenuMapper.java similarity index 70% rename from src/main/java/com/youlai/system/mapper/SysMenuMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysMenuMapper.java index 3cd3aa41..5e7c2b78 100644 --- a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysMenuMapper.java @@ -1,8 +1,8 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.SysMenu; -import com.youlai.system.model.bo.RouteBO; +import com.youlai.boot.module.system.model.bo.RouteBO; +import com.youlai.boot.module.system.model.entity.SysMenu; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/system/mapper/SysRoleMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysRoleMapper.java similarity index 76% rename from src/main/java/com/youlai/system/mapper/SysRoleMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysRoleMapper.java index fba8f94c..85048828 100644 --- a/src/main/java/com/youlai/system/mapper/SysRoleMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.SysRole; +import com.youlai.boot.module.system.model.entity.SysRole; import org.apache.ibatis.annotations.Mapper; import java.util.Set; diff --git a/src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysRoleMenuMapper.java similarity index 81% rename from src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysRoleMenuMapper.java index 371e5639..db500621 100644 --- a/src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysRoleMenuMapper.java @@ -1,8 +1,8 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.bo.RolePermsBO; -import com.youlai.system.model.entity.SysRoleMenu; +import com.youlai.boot.module.system.model.bo.RolePermsBO; +import com.youlai.boot.module.system.model.entity.SysRoleMenu; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysUserMapper.java similarity index 72% rename from src/main/java/com/youlai/system/mapper/SysUserMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysUserMapper.java index e222c3ad..a1db6429 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysUserMapper.java @@ -1,14 +1,14 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.form.UserForm; -import com.youlai.system.plugin.mybatis.annotation.DataPermission; -import com.youlai.system.model.bo.UserBO; -import com.youlai.system.model.entity.SysUser; -import com.youlai.system.model.dto.UserAuthInfo; -import com.youlai.system.model.query.UserPageQuery; -import com.youlai.system.model.dto.UserExportDTO; +import com.youlai.boot.module.system.model.bo.UserBO; +import com.youlai.boot.module.system.model.entity.SysUser; +import com.youlai.boot.module.system.model.query.UserPageQuery; +import com.youlai.boot.module.system.model.form.UserForm; +import com.youlai.boot.common.annotation.DataPermission; +import com.youlai.boot.module.system.model.dto.UserAuthInfo; +import com.youlai.boot.module.system.model.dto.UserExportDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java b/src/main/java/com/youlai/boot/module/system/mapper/SysUserRoleMapper.java similarity index 78% rename from src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java rename to src/main/java/com/youlai/boot/module/system/mapper/SysUserRoleMapper.java index 7b96ec00..01ce905a 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java +++ b/src/main/java/com/youlai/boot/module/system/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.SysUserRole; +import com.youlai.boot.module.system.model.entity.SysUserRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/system/model/bo/ColumnMetaData.java b/src/main/java/com/youlai/boot/module/system/model/bo/ColumnMetaData.java similarity index 94% rename from src/main/java/com/youlai/system/model/bo/ColumnMetaData.java rename to src/main/java/com/youlai/boot/module/system/model/bo/ColumnMetaData.java index c3137a2a..9c4bfbac 100644 --- a/src/main/java/com/youlai/system/model/bo/ColumnMetaData.java +++ b/src/main/java/com/youlai/boot/module/system/model/bo/ColumnMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.module.system.model.bo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/bo/RolePermsBO.java b/src/main/java/com/youlai/boot/module/system/model/bo/RolePermsBO.java similarity index 86% rename from src/main/java/com/youlai/system/model/bo/RolePermsBO.java rename to src/main/java/com/youlai/boot/module/system/model/bo/RolePermsBO.java index 6e8c764a..81ed7f42 100644 --- a/src/main/java/com/youlai/system/model/bo/RolePermsBO.java +++ b/src/main/java/com/youlai/boot/module/system/model/bo/RolePermsBO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.module.system.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/bo/RouteBO.java b/src/main/java/com/youlai/boot/module/system/model/bo/RouteBO.java similarity index 96% rename from src/main/java/com/youlai/system/model/bo/RouteBO.java rename to src/main/java/com/youlai/boot/module/system/model/bo/RouteBO.java index dce35ddb..b0b8071b 100644 --- a/src/main/java/com/youlai/system/model/bo/RouteBO.java +++ b/src/main/java/com/youlai/boot/module/system/model/bo/RouteBO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.module.system.model.bo; import com.youlai.system.enums.MenuTypeEnum; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/bo/TableMetaData.java b/src/main/java/com/youlai/boot/module/system/model/bo/TableMetaData.java similarity index 91% rename from src/main/java/com/youlai/system/model/bo/TableMetaData.java rename to src/main/java/com/youlai/boot/module/system/model/bo/TableMetaData.java index d4b78792..f78ae8b3 100644 --- a/src/main/java/com/youlai/system/model/bo/TableMetaData.java +++ b/src/main/java/com/youlai/boot/module/system/model/bo/TableMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.module.system.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/bo/UserBO.java b/src/main/java/com/youlai/boot/module/system/model/bo/UserBO.java similarity index 95% rename from src/main/java/com/youlai/system/model/bo/UserBO.java rename to src/main/java/com/youlai/boot/module/system/model/bo/UserBO.java index 34395570..5c67274b 100644 --- a/src/main/java/com/youlai/system/model/bo/UserBO.java +++ b/src/main/java/com/youlai/boot/module/system/model/bo/UserBO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.module.system.model.bo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/bo/VisitCount.java b/src/main/java/com/youlai/boot/module/system/model/bo/VisitCount.java similarity index 84% rename from src/main/java/com/youlai/system/model/bo/VisitCount.java rename to src/main/java/com/youlai/boot/module/system/model/bo/VisitCount.java index 3c9a22c0..4e06969f 100644 --- a/src/main/java/com/youlai/system/model/bo/VisitCount.java +++ b/src/main/java/com/youlai/boot/module/system/model/bo/VisitCount.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.module.system.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/dto/CaptchaResult.java b/src/main/java/com/youlai/boot/module/system/model/dto/CaptchaResult.java similarity index 91% rename from src/main/java/com/youlai/system/model/dto/CaptchaResult.java rename to src/main/java/com/youlai/boot/module/system/model/dto/CaptchaResult.java index 4f7e34dd..646391b6 100644 --- a/src/main/java/com/youlai/system/model/dto/CaptchaResult.java +++ b/src/main/java/com/youlai/boot/module/system/model/dto/CaptchaResult.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.module.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/youlai/system/model/dto/ChatMessage.java b/src/main/java/com/youlai/boot/module/system/model/dto/ChatMessage.java similarity index 86% rename from src/main/java/com/youlai/system/model/dto/ChatMessage.java rename to src/main/java/com/youlai/boot/module/system/model/dto/ChatMessage.java index 6dd6de32..449b3503 100644 --- a/src/main/java/com/youlai/system/model/dto/ChatMessage.java +++ b/src/main/java/com/youlai/boot/module/system/model/dto/ChatMessage.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.module.system.model.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/dto/FileInfo.java b/src/main/java/com/youlai/boot/module/system/model/dto/FileInfo.java similarity index 84% rename from src/main/java/com/youlai/system/model/dto/FileInfo.java rename to src/main/java/com/youlai/boot/module/system/model/dto/FileInfo.java index 86be5d94..f5bf340b 100644 --- a/src/main/java/com/youlai/system/model/dto/FileInfo.java +++ b/src/main/java/com/youlai/boot/module/system/model/dto/FileInfo.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.module.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/dto/LoginResult.java b/src/main/java/com/youlai/boot/module/system/model/dto/LoginResult.java similarity index 91% rename from src/main/java/com/youlai/system/model/dto/LoginResult.java rename to src/main/java/com/youlai/boot/module/system/model/dto/LoginResult.java index 764749b2..28e348c5 100644 --- a/src/main/java/com/youlai/system/model/dto/LoginResult.java +++ b/src/main/java/com/youlai/boot/module/system/model/dto/LoginResult.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.module.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/youlai/system/model/dto/UserAuthInfo.java b/src/main/java/com/youlai/boot/module/system/model/dto/UserAuthInfo.java similarity index 89% rename from src/main/java/com/youlai/system/model/dto/UserAuthInfo.java rename to src/main/java/com/youlai/boot/module/system/model/dto/UserAuthInfo.java index 2117ecc1..d4dd814b 100644 --- a/src/main/java/com/youlai/system/model/dto/UserAuthInfo.java +++ b/src/main/java/com/youlai/boot/module/system/model/dto/UserAuthInfo.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.module.system.model.dto; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/dto/UserExportDTO.java b/src/main/java/com/youlai/boot/module/system/model/dto/UserExportDTO.java similarity index 94% rename from src/main/java/com/youlai/system/model/dto/UserExportDTO.java rename to src/main/java/com/youlai/boot/module/system/model/dto/UserExportDTO.java index c0bc88eb..4d9d1feb 100644 --- a/src/main/java/com/youlai/system/model/dto/UserExportDTO.java +++ b/src/main/java/com/youlai/boot/module/system/model/dto/UserExportDTO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.module.system.model.dto; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; diff --git a/src/main/java/com/youlai/system/model/dto/UserImportDTO.java b/src/main/java/com/youlai/boot/module/system/model/dto/UserImportDTO.java similarity index 92% rename from src/main/java/com/youlai/system/model/dto/UserImportDTO.java rename to src/main/java/com/youlai/boot/module/system/model/dto/UserImportDTO.java index 40694b2e..c895bfdd 100644 --- a/src/main/java/com/youlai/system/model/dto/UserImportDTO.java +++ b/src/main/java/com/youlai/boot/module/system/model/dto/UserImportDTO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.module.system.model.dto; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/entity/GenConfig.java b/src/main/java/com/youlai/boot/module/system/model/entity/GenConfig.java similarity index 93% rename from src/main/java/com/youlai/system/model/entity/GenConfig.java rename to src/main/java/com/youlai/boot/module/system/model/entity/GenConfig.java index 97d9e6ef..36da6c4e 100644 --- a/src/main/java/com/youlai/system/model/entity/GenConfig.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/GenConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/boot/module/system/model/entity/GenFieldConfig.java similarity index 97% rename from src/main/java/com/youlai/system/model/entity/GenFieldConfig.java rename to src/main/java/com/youlai/boot/module/system/model/entity/GenFieldConfig.java index 0609ecb0..e8d92c52 100644 --- a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/GenFieldConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/src/main/java/com/youlai/system/model/entity/SysConfig.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysConfig.java similarity index 86% rename from src/main/java/com/youlai/system/model/entity/SysConfig.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysConfig.java index a0c52683..10140b65 100644 --- a/src/main/java/com/youlai/system/model/entity/SysConfig.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysConfig.java @@ -1,10 +1,8 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.baomidou.mybatisplus.annotation.*; +import com.youlai.boot.common.base.BaseEntity; import lombok.Data; -import lombok.Builder; -import java.io.Serializable; -import com.youlai.system.common.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; /** @@ -13,9 +11,9 @@ import io.swagger.v3.oas.annotations.media.Schema; * @author Theo * @since 2024-07-29 11:17:26 */ -@Data -@TableName("sys_config") @Schema(description = "系统配置") +@TableName("sys_config") +@Data public class SysConfig extends BaseEntity { @Schema(description = "配置名称") diff --git a/src/main/java/com/youlai/system/model/entity/SysDept.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysDept.java similarity index 93% rename from src/main/java/com/youlai/system/model/entity/SysDept.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysDept.java index f2952e30..64aaa5f4 100644 --- a/src/main/java/com/youlai/system/model/entity/SysDept.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.youlai.system.common.base.BaseEntity; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/model/entity/SysDict.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysDict.java similarity index 89% rename from src/main/java/com/youlai/system/model/entity/SysDict.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysDict.java index 84380234..012ded60 100644 --- a/src/main/java/com/youlai/system/model/entity/SysDict.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysDict.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.youlai.system.common.base.BaseEntity; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/entity/SysDictItem.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysDictItem.java similarity index 93% rename from src/main/java/com/youlai/system/model/entity/SysDictItem.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysDictItem.java index c90a6c22..53af28a9 100644 --- a/src/main/java/com/youlai/system/model/entity/SysDictItem.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysDictItem.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/youlai/system/model/entity/SysLog.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysLog.java similarity index 95% rename from src/main/java/com/youlai/system/model/entity/SysLog.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysLog.java index 10536bba..70a2b82f 100644 --- a/src/main/java/com/youlai/system/model/entity/SysLog.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysLog.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/src/main/java/com/youlai/system/model/entity/SysMenu.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysMenu.java similarity index 97% rename from src/main/java/com/youlai/system/model/entity/SysMenu.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysMenu.java index 26a77ccc..a0500f12 100644 --- a/src/main/java/com/youlai/system/model/entity/SysMenu.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/src/main/java/com/youlai/system/model/entity/SysRole.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysRole.java similarity index 92% rename from src/main/java/com/youlai/system/model/entity/SysRole.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysRole.java index 6b4ca6a7..01ec0fbd 100644 --- a/src/main/java/com/youlai/system/model/entity/SysRole.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.youlai.system.common.base.BaseEntity; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/model/entity/SysRoleMenu.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysRoleMenu.java similarity index 89% rename from src/main/java/com/youlai/system/model/entity/SysRoleMenu.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysRoleMenu.java index 59f2d09b..ec967acf 100644 --- a/src/main/java/com/youlai/system/model/entity/SysRoleMenu.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/youlai/system/model/entity/SysUser.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysUser.java similarity index 94% rename from src/main/java/com/youlai/system/model/entity/SysUser.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysUser.java index 6e79dc64..4f6a0d83 100644 --- a/src/main/java/com/youlai/system/model/entity/SysUser.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.youlai.system.common.base.BaseEntity; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/model/entity/SysUserRole.java b/src/main/java/com/youlai/boot/module/system/model/entity/SysUserRole.java similarity index 90% rename from src/main/java/com/youlai/system/model/entity/SysUserRole.java rename to src/main/java/com/youlai/boot/module/system/model/entity/SysUserRole.java index 11a5a539..91884495 100644 --- a/src/main/java/com/youlai/system/model/entity/SysUserRole.java +++ b/src/main/java/com/youlai/boot/module/system/model/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.module.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/youlai/system/model/form/ConfigForm.java b/src/main/java/com/youlai/boot/module/system/model/form/ConfigForm.java similarity index 95% rename from src/main/java/com/youlai/system/model/form/ConfigForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/ConfigForm.java index 2d0fcda4..c4dc53f2 100644 --- a/src/main/java/com/youlai/system/model/form/ConfigForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/ConfigForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/youlai/system/model/form/DeptForm.java b/src/main/java/com/youlai/boot/module/system/model/form/DeptForm.java similarity index 94% rename from src/main/java/com/youlai/system/model/form/DeptForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/DeptForm.java index 5a5941dd..be4465a1 100644 --- a/src/main/java/com/youlai/system/model/form/DeptForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/DeptForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/youlai/system/model/form/DictForm.java b/src/main/java/com/youlai/boot/module/system/model/form/DictForm.java similarity index 96% rename from src/main/java/com/youlai/system/model/form/DictForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/DictForm.java index 12e61616..3dcd3ef6 100644 --- a/src/main/java/com/youlai/system/model/form/DictForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/DictForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/form/EmailChangeForm.java b/src/main/java/com/youlai/boot/module/system/model/form/EmailChangeForm.java similarity index 87% rename from src/main/java/com/youlai/system/model/form/EmailChangeForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/EmailChangeForm.java index 8ae16df2..359aa39e 100644 --- a/src/main/java/com/youlai/system/model/form/EmailChangeForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/EmailChangeForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/form/GenConfigForm.java b/src/main/java/com/youlai/boot/module/system/model/form/GenConfigForm.java similarity index 98% rename from src/main/java/com/youlai/system/model/form/GenConfigForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/GenConfigForm.java index 18b56560..dda78b5f 100644 --- a/src/main/java/com/youlai/system/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/GenConfigForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import com.youlai.system.enums.FormTypeEnum; import com.youlai.system.enums.QueryTypeEnum; diff --git a/src/main/java/com/youlai/system/model/form/MenuForm.java b/src/main/java/com/youlai/boot/module/system/model/form/MenuForm.java similarity index 97% rename from src/main/java/com/youlai/system/model/form/MenuForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/MenuForm.java index 4856e409..d19282b3 100644 --- a/src/main/java/com/youlai/system/model/form/MenuForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/MenuForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import com.youlai.system.enums.MenuTypeEnum; import com.youlai.system.common.model.KeyValue; diff --git a/src/main/java/com/youlai/system/model/form/MobileBindingForm.java b/src/main/java/com/youlai/boot/module/system/model/form/MobileBindingForm.java similarity index 87% rename from src/main/java/com/youlai/system/model/form/MobileBindingForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/MobileBindingForm.java index 9a678316..1fed9626 100644 --- a/src/main/java/com/youlai/system/model/form/MobileBindingForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/MobileBindingForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/form/PasswordChangeForm.java b/src/main/java/com/youlai/boot/module/system/model/form/PasswordChangeForm.java similarity index 88% rename from src/main/java/com/youlai/system/model/form/PasswordChangeForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/PasswordChangeForm.java index a48f17f4..e1feb52b 100644 --- a/src/main/java/com/youlai/system/model/form/PasswordChangeForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/PasswordChangeForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/form/PasswordResetForm.java b/src/main/java/com/youlai/boot/module/system/model/form/PasswordResetForm.java similarity index 87% rename from src/main/java/com/youlai/system/model/form/PasswordResetForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/PasswordResetForm.java index f61f49ec..d08f1545 100644 --- a/src/main/java/com/youlai/system/model/form/PasswordResetForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/PasswordResetForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/form/RoleForm.java b/src/main/java/com/youlai/boot/module/system/model/form/RoleForm.java similarity index 94% rename from src/main/java/com/youlai/system/model/form/RoleForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/RoleForm.java index 884c0c89..7f99191b 100644 --- a/src/main/java/com/youlai/system/model/form/RoleForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/RoleForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/form/UserForm.java b/src/main/java/com/youlai/boot/module/system/model/form/UserForm.java similarity index 96% rename from src/main/java/com/youlai/system/model/form/UserForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/UserForm.java index 6d8dda91..4b933b3f 100644 --- a/src/main/java/com/youlai/system/model/form/UserForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/UserForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/form/UserProfileForm.java b/src/main/java/com/youlai/boot/module/system/model/form/UserProfileForm.java similarity index 93% rename from src/main/java/com/youlai/system/model/form/UserProfileForm.java rename to src/main/java/com/youlai/boot/module/system/model/form/UserProfileForm.java index 2f23fdc4..df145388 100644 --- a/src/main/java/com/youlai/system/model/form/UserProfileForm.java +++ b/src/main/java/com/youlai/boot/module/system/model/form/UserProfileForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.module.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/query/ConfigPageQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/ConfigPageQuery.java similarity index 79% rename from src/main/java/com/youlai/system/model/query/ConfigPageQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/ConfigPageQuery.java index 13398e25..c96457f3 100644 --- a/src/main/java/com/youlai/system/model/query/ConfigPageQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/ConfigPageQuery.java @@ -1,6 +1,6 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; -import com.youlai.system.common.base.BasePageQuery; +import com.youlai.boot.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/system/model/query/DeptQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/DeptQuery.java similarity index 88% rename from src/main/java/com/youlai/system/model/query/DeptQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/DeptQuery.java index b12215c3..e1d04f1a 100644 --- a/src/main/java/com/youlai/system/model/query/DeptQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/DeptQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/query/DictPageQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/DictPageQuery.java similarity index 88% rename from src/main/java/com/youlai/system/model/query/DictPageQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/DictPageQuery.java index 79fb322c..4d9b3ed6 100644 --- a/src/main/java/com/youlai/system/model/query/DictPageQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/DictPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; import com.youlai.system.common.base.BasePageQuery; diff --git a/src/main/java/com/youlai/system/model/query/LogPageQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/LogPageQuery.java similarity index 91% rename from src/main/java/com/youlai/system/model/query/LogPageQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/LogPageQuery.java index e5bc11e3..d7cdc49f 100644 --- a/src/main/java/com/youlai/system/model/query/LogPageQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/LogPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; import com.youlai.system.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/query/MenuQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/MenuQuery.java similarity index 88% rename from src/main/java/com/youlai/system/model/query/MenuQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/MenuQuery.java index 7967931e..58b3a94e 100644 --- a/src/main/java/com/youlai/system/model/query/MenuQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/MenuQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/query/PermPageQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/PermPageQuery.java similarity index 88% rename from src/main/java/com/youlai/system/model/query/PermPageQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/PermPageQuery.java index a497f0ce..94d5536e 100644 --- a/src/main/java/com/youlai/system/model/query/PermPageQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/PermPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; import com.youlai.system.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/query/RolePageQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/RolePageQuery.java similarity index 93% rename from src/main/java/com/youlai/system/model/query/RolePageQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/RolePageQuery.java index 02c0eb93..fd4d8d85 100644 --- a/src/main/java/com/youlai/system/model/query/RolePageQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/RolePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; import com.fasterxml.jackson.annotation.JsonFormat; import com.youlai.system.common.base.BasePageQuery; diff --git a/src/main/java/com/youlai/system/model/query/TablePageQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/TablePageQuery.java similarity index 92% rename from src/main/java/com/youlai/system/model/query/TablePageQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/TablePageQuery.java index 3844a804..702d1270 100644 --- a/src/main/java/com/youlai/system/model/query/TablePageQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/TablePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; import com.fasterxml.jackson.annotation.JsonIgnore; import com.youlai.system.common.base.BasePageQuery; diff --git a/src/main/java/com/youlai/system/model/query/UserPageQuery.java b/src/main/java/com/youlai/boot/module/system/model/query/UserPageQuery.java similarity index 92% rename from src/main/java/com/youlai/system/model/query/UserPageQuery.java rename to src/main/java/com/youlai/boot/module/system/model/query/UserPageQuery.java index 025ff868..3fd8c499 100644 --- a/src/main/java/com/youlai/system/model/query/UserPageQuery.java +++ b/src/main/java/com/youlai/boot/module/system/model/query/UserPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.module.system.model.query; import com.youlai.system.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/vo/ConfigVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/ConfigVO.java similarity index 94% rename from src/main/java/com/youlai/system/model/vo/ConfigVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/ConfigVO.java index a27e971e..e96275e1 100644 --- a/src/main/java/com/youlai/system/model/vo/ConfigVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/ConfigVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/youlai/system/model/vo/DeptVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/DeptVO.java similarity index 95% rename from src/main/java/com/youlai/system/model/vo/DeptVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/DeptVO.java index 4e0c5b3a..3c93d87e 100644 --- a/src/main/java/com/youlai/system/model/vo/DeptVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/DeptVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/vo/DictPageVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/DictPageVO.java similarity index 95% rename from src/main/java/com/youlai/system/model/vo/DictPageVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/DictPageVO.java index f2590a36..ae097bd4 100644 --- a/src/main/java/com/youlai/system/model/vo/DictPageVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/DictPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/vo/GeneratorPreviewVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/GeneratorPreviewVO.java similarity index 89% rename from src/main/java/com/youlai/system/model/vo/GeneratorPreviewVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/GeneratorPreviewVO.java index c4e8f62b..da23ac44 100644 --- a/src/main/java/com/youlai/system/model/vo/GeneratorPreviewVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/GeneratorPreviewVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/vo/LogPageVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/LogPageVO.java similarity index 96% rename from src/main/java/com/youlai/system/model/vo/LogPageVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/LogPageVO.java index 78898686..8653913f 100644 --- a/src/main/java/com/youlai/system/model/vo/LogPageVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/LogPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.youlai.system.enums.LogModuleEnum; diff --git a/src/main/java/com/youlai/system/model/vo/MenuVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/MenuVO.java similarity index 96% rename from src/main/java/com/youlai/system/model/vo/MenuVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/MenuVO.java index 6ca1545a..41ba40e4 100644 --- a/src/main/java/com/youlai/system/model/vo/MenuVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/MenuVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import com.fasterxml.jackson.annotation.JsonInclude; import com.youlai.system.enums.MenuTypeEnum; diff --git a/src/main/java/com/youlai/system/model/vo/RolePageVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/RolePageVO.java similarity index 93% rename from src/main/java/com/youlai/system/model/vo/RolePageVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/RolePageVO.java index fc06a1db..ad41939e 100644 --- a/src/main/java/com/youlai/system/model/vo/RolePageVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/RolePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/vo/RouteVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/RouteVO.java similarity index 97% rename from src/main/java/com/youlai/system/model/vo/RouteVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/RouteVO.java index 18dec3b1..bfefa969 100644 --- a/src/main/java/com/youlai/system/model/vo/RouteVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/RouteVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/vo/TablePageVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/TablePageVO.java similarity index 94% rename from src/main/java/com/youlai/system/model/vo/TablePageVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/TablePageVO.java index aff66e51..0d3b020a 100644 --- a/src/main/java/com/youlai/system/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/TablePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/vo/UserInfoVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/UserInfoVO.java similarity index 93% rename from src/main/java/com/youlai/system/model/vo/UserInfoVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/UserInfoVO.java index 9513e7a8..797b68b2 100644 --- a/src/main/java/com/youlai/system/model/vo/UserInfoVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/UserInfoVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/vo/UserPageVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/UserPageVO.java similarity index 95% rename from src/main/java/com/youlai/system/model/vo/UserPageVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/UserPageVO.java index b2d0aa2a..36a52580 100644 --- a/src/main/java/com/youlai/system/model/vo/UserPageVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/UserPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/vo/UserProfileVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/UserProfileVO.java similarity index 95% rename from src/main/java/com/youlai/system/model/vo/UserProfileVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/UserProfileVO.java index 448479a3..48098131 100644 --- a/src/main/java/com/youlai/system/model/vo/UserProfileVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/UserProfileVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/model/vo/VisitStatsVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/VisitStatsVO.java similarity index 93% rename from src/main/java/com/youlai/system/model/vo/VisitStatsVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/VisitStatsVO.java index 7cc5685e..cc5c13ed 100644 --- a/src/main/java/com/youlai/system/model/vo/VisitStatsVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/VisitStatsVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/model/vo/VisitTrendVO.java b/src/main/java/com/youlai/boot/module/system/model/vo/VisitTrendVO.java similarity index 91% rename from src/main/java/com/youlai/system/model/vo/VisitTrendVO.java rename to src/main/java/com/youlai/boot/module/system/model/vo/VisitTrendVO.java index 2e686d58..3a8c1169 100644 --- a/src/main/java/com/youlai/system/model/vo/VisitTrendVO.java +++ b/src/main/java/com/youlai/boot/module/system/model/vo/VisitTrendVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.module.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/service/AuthService.java b/src/main/java/com/youlai/boot/module/system/service/AuthService.java similarity index 72% rename from src/main/java/com/youlai/system/service/AuthService.java rename to src/main/java/com/youlai/boot/module/system/service/AuthService.java index 40c6c4bb..d23d2094 100644 --- a/src/main/java/com/youlai/system/service/AuthService.java +++ b/src/main/java/com/youlai/boot/module/system/service/AuthService.java @@ -1,7 +1,7 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; -import com.youlai.system.model.dto.CaptchaResult; -import com.youlai.system.model.dto.LoginResult; +import com.youlai.boot.module.system.model.dto.CaptchaResult; +import com.youlai.boot.module.system.model.dto.LoginResult; /** * 认证服务接口 diff --git a/src/main/java/com/youlai/system/service/SysConfigService.java b/src/main/java/com/youlai/boot/module/system/service/SysConfigService.java similarity index 82% rename from src/main/java/com/youlai/system/service/SysConfigService.java rename to src/main/java/com/youlai/boot/module/system/service/SysConfigService.java index 21296ac7..fd507ef1 100644 --- a/src/main/java/com/youlai/system/service/SysConfigService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysConfigService.java @@ -1,11 +1,11 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.SysConfig; -import com.youlai.system.model.form.ConfigForm; -import com.youlai.system.model.query.ConfigPageQuery; -import com.youlai.system.model.vo.ConfigVO; +import com.youlai.boot.module.system.model.entity.SysConfig; +import com.youlai.boot.module.system.model.form.ConfigForm; +import com.youlai.boot.module.system.model.query.ConfigPageQuery; +import com.youlai.boot.module.system.model.vo.ConfigVO; /** * 系统配置Service接口 diff --git a/src/main/java/com/youlai/system/service/SysDeptService.java b/src/main/java/com/youlai/boot/module/system/service/SysDeptService.java similarity index 80% rename from src/main/java/com/youlai/system/service/SysDeptService.java rename to src/main/java/com/youlai/boot/module/system/service/SysDeptService.java index 1185b735..e221599d 100644 --- a/src/main/java/com/youlai/system/service/SysDeptService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysDeptService.java @@ -1,11 +1,11 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.youlai.boot.module.system.model.entity.SysDept; import com.youlai.system.common.model.Option; -import com.youlai.system.model.entity.SysDept; -import com.youlai.system.model.form.DeptForm; -import com.youlai.system.model.query.DeptQuery; -import com.youlai.system.model.vo.DeptVO; +import com.youlai.boot.module.system.model.form.DeptForm; +import com.youlai.boot.module.system.model.query.DeptQuery; +import com.youlai.boot.module.system.model.vo.DeptVO; import java.util.List; diff --git a/src/main/java/com/youlai/system/service/SysDictItemService.java b/src/main/java/com/youlai/boot/module/system/service/SysDictItemService.java similarity index 64% rename from src/main/java/com/youlai/system/service/SysDictItemService.java rename to src/main/java/com/youlai/boot/module/system/service/SysDictItemService.java index 44698490..176f20ea 100644 --- a/src/main/java/com/youlai/system/service/SysDictItemService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysDictItemService.java @@ -1,7 +1,7 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.SysDictItem; +import com.youlai.boot.module.system.model.entity.SysDictItem; /** * 字典项 接口 diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/boot/module/system/service/SysDictService.java similarity index 82% rename from src/main/java/com/youlai/system/service/SysDictService.java rename to src/main/java/com/youlai/boot/module/system/service/SysDictService.java index 5f8b606d..5187f2b0 100644 --- a/src/main/java/com/youlai/system/service/SysDictService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysDictService.java @@ -1,12 +1,12 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.system.common.model.Option; -import com.youlai.system.model.entity.SysDict; -import com.youlai.system.model.form.DictForm; -import com.youlai.system.model.query.DictPageQuery; -import com.youlai.system.model.vo.DictPageVO; +import com.youlai.boot.module.system.model.entity.SysDict; +import com.youlai.boot.module.system.model.form.DictForm; +import com.youlai.boot.module.system.model.query.DictPageQuery; +import com.youlai.boot.module.system.model.vo.DictPageVO; import java.util.List; diff --git a/src/main/java/com/youlai/system/service/SysLogService.java b/src/main/java/com/youlai/boot/module/system/service/SysLogService.java similarity index 69% rename from src/main/java/com/youlai/system/service/SysLogService.java rename to src/main/java/com/youlai/boot/module/system/service/SysLogService.java index b0801e31..bde97109 100644 --- a/src/main/java/com/youlai/system/service/SysLogService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysLogService.java @@ -1,12 +1,12 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.entity.SysLog; +import com.youlai.boot.module.system.model.entity.SysLog; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.query.LogPageQuery; -import com.youlai.system.model.vo.LogPageVO; -import com.youlai.system.model.vo.VisitStatsVO; -import com.youlai.system.model.vo.VisitTrendVO; +import com.youlai.boot.module.system.model.query.LogPageQuery; +import com.youlai.boot.module.system.model.vo.LogPageVO; +import com.youlai.boot.module.system.model.vo.VisitStatsVO; +import com.youlai.boot.module.system.model.vo.VisitTrendVO; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/com/youlai/system/service/SysMenuService.java b/src/main/java/com/youlai/boot/module/system/service/SysMenuService.java similarity index 77% rename from src/main/java/com/youlai/system/service/SysMenuService.java rename to src/main/java/com/youlai/boot/module/system/service/SysMenuService.java index b55a2369..df78c4cb 100644 --- a/src/main/java/com/youlai/system/service/SysMenuService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysMenuService.java @@ -1,13 +1,13 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.GenConfig; -import com.youlai.system.model.form.MenuForm; +import com.youlai.boot.module.system.model.entity.GenConfig; +import com.youlai.boot.module.system.model.form.MenuForm; import com.youlai.system.common.model.Option; -import com.youlai.system.model.entity.SysMenu; -import com.youlai.system.model.query.MenuQuery; -import com.youlai.system.model.vo.MenuVO; -import com.youlai.system.model.vo.RouteVO; +import com.youlai.boot.module.system.model.entity.SysMenu; +import com.youlai.boot.module.system.model.query.MenuQuery; +import com.youlai.boot.module.system.model.vo.MenuVO; +import com.youlai.boot.module.system.model.vo.RouteVO; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/youlai/system/service/SysRoleMenuService.java b/src/main/java/com/youlai/boot/module/system/service/SysRoleMenuService.java similarity index 90% rename from src/main/java/com/youlai/system/service/SysRoleMenuService.java rename to src/main/java/com/youlai/boot/module/system/service/SysRoleMenuService.java index 0532b835..b52c642d 100644 --- a/src/main/java/com/youlai/system/service/SysRoleMenuService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysRoleMenuService.java @@ -1,8 +1,8 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.SysRoleMenu; +import com.youlai.boot.module.system.model.entity.SysRoleMenu; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/youlai/system/service/SysRoleService.java b/src/main/java/com/youlai/boot/module/system/service/SysRoleService.java similarity index 86% rename from src/main/java/com/youlai/system/service/SysRoleService.java rename to src/main/java/com/youlai/boot/module/system/service/SysRoleService.java index a03b0bcc..a9925ab5 100644 --- a/src/main/java/com/youlai/system/service/SysRoleService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysRoleService.java @@ -1,13 +1,13 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.youlai.boot.module.system.model.entity.SysRole; import com.youlai.system.common.model.Option; -import com.youlai.system.model.entity.SysRole; -import com.youlai.system.model.form.RoleForm; -import com.youlai.system.model.query.RolePageQuery; -import com.youlai.system.model.vo.RolePageVO; +import com.youlai.boot.module.system.model.form.RoleForm; +import com.youlai.boot.module.system.model.query.RolePageQuery; +import com.youlai.boot.module.system.model.vo.RolePageVO; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/youlai/system/service/SysUserRoleService.java b/src/main/java/com/youlai/boot/module/system/service/SysUserRoleService.java similarity index 82% rename from src/main/java/com/youlai/system/service/SysUserRoleService.java rename to src/main/java/com/youlai/boot/module/system/service/SysUserRoleService.java index 5bb52b9d..4b14ddc8 100644 --- a/src/main/java/com/youlai/system/service/SysUserRoleService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysUserRoleService.java @@ -1,8 +1,8 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.SysUserRole; +import com.youlai.boot.module.system.model.entity.SysUserRole; import java.util.List; diff --git a/src/main/java/com/youlai/system/service/SysUserService.java b/src/main/java/com/youlai/boot/module/system/service/SysUserService.java similarity index 81% rename from src/main/java/com/youlai/system/service/SysUserService.java rename to src/main/java/com/youlai/boot/module/system/service/SysUserService.java index 4a5ba81f..92daf1fa 100644 --- a/src/main/java/com/youlai/system/service/SysUserService.java +++ b/src/main/java/com/youlai/boot/module/system/service/SysUserService.java @@ -1,17 +1,19 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.youlai.boot.common.enums.ContactType; +import com.youlai.boot.module.system.model.dto.UserAuthInfo; +import com.youlai.boot.module.system.model.dto.UserExportDTO; +import com.youlai.boot.module.system.model.entity.SysUser; +import com.youlai.boot.module.system.model.form.*; +import com.youlai.boot.module.system.model.query.UserPageQuery; +import com.youlai.boot.module.system.model.vo.UserInfoVO; +import com.youlai.boot.module.system.model.vo.UserPageVO; +import com.youlai.boot.module.system.model.vo.UserProfileVO; +import com.youlai.boot.system.model.form.*; import com.youlai.system.enums.ContactType; -import com.youlai.system.model.entity.SysUser; -import com.youlai.system.model.form.*; -import com.youlai.system.model.dto.UserAuthInfo; -import com.youlai.system.model.query.UserPageQuery; -import com.youlai.system.model.dto.UserExportDTO; -import com.youlai.system.model.vo.UserInfoVO; -import com.youlai.system.model.vo.UserPageVO; -import com.youlai.system.model.vo.UserProfileVO; import java.util.List; diff --git a/src/main/java/com/youlai/system/service/WebsocketService.java b/src/main/java/com/youlai/boot/module/system/service/WebsocketService.java similarity index 70% rename from src/main/java/com/youlai/system/service/WebsocketService.java rename to src/main/java/com/youlai/boot/module/system/service/WebsocketService.java index b9b4254d..c4d3b530 100644 --- a/src/main/java/com/youlai/system/service/WebsocketService.java +++ b/src/main/java/com/youlai/boot/module/system/service/WebsocketService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service; +package com.youlai.boot.module.system.service; public interface WebsocketService { diff --git a/src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/AuthServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/AuthServiceImpl.java index 1013fa29..3271d095 100644 --- a/src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/AuthServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CaptchaUtil; @@ -10,11 +10,11 @@ import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; import com.youlai.system.common.constant.SecurityConstants; import com.youlai.system.enums.CaptchaTypeEnum; -import com.youlai.system.model.dto.CaptchaResult; -import com.youlai.system.model.dto.LoginResult; -import com.youlai.system.config.property.CaptchaProperties; +import com.youlai.boot.module.system.model.dto.CaptchaResult; +import com.youlai.boot.module.system.model.dto.LoginResult; +import com.youlai.boot.config.property.CaptchaProperties; import com.youlai.system.service.AuthService; -import com.youlai.system.security.util.JwtUtils; +import com.youlai.boot.framework.security.util.JwtUtils; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysConfigServiceImpl.java similarity index 83% rename from src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysConfigServiceImpl.java index 097367d2..4a795322 100644 --- a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysConfigServiceImpl.java @@ -1,23 +1,23 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.system.common.constant.RedisConstants; -import com.youlai.system.converter.SysConfigConverter; -import com.youlai.system.model.form.ConfigForm; -import com.youlai.system.model.query.ConfigPageQuery; -import com.youlai.system.security.util.SecurityUtils; +import com.youlai.boot.common.constant.RedisConstants; +import com.youlai.boot.module.system.converter.ConfigConverter; +import com.youlai.boot.module.system.mapper.SysConfigMapper; +import com.youlai.boot.module.system.model.entity.SysConfig; +import com.youlai.boot.module.system.model.form.ConfigForm; +import com.youlai.boot.module.system.model.query.ConfigPageQuery; +import com.youlai.boot.module.system.model.vo.ConfigVO; +import com.youlai.boot.module.system.service.SysConfigService; +import com.youlai.boot.framework.security.util.SecurityUtils; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import com.youlai.system.mapper.SysConfigMapper; -import com.youlai.system.model.entity.SysConfig; -import com.youlai.system.model.vo.ConfigVO; -import com.youlai.system.service.SysConfigService; import org.springframework.util.Assert; import java.util.List; @@ -36,7 +36,7 @@ public class SysConfigServiceImpl extends ServiceImpl redisTemplate; @@ -66,7 +66,7 @@ public class SysConfigServiceImpl extends ServiceImpl pageList = this.page(page, query); - return sysConfigConverter.toPageVo(pageList); + return configConverter.toPageVo(pageList); } /** @@ -80,7 +80,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq(SysConfig::getConfigKey, configForm.getConfigKey())) == 0, "配置键已存在"); - SysConfig sysConfig = sysConfigConverter.toEntity(configForm); + SysConfig sysConfig = configConverter.toEntity(configForm); sysConfig.setCreateBy(SecurityUtils.getUserId()); return this.save(sysConfig); } @@ -94,7 +94,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq(SysConfig::getConfigKey, configForm.getConfigKey()).ne(SysConfig::getId, id)) == 0, "配置键已存在"); - SysConfig sysConfig = sysConfigConverter.toEntity(configForm); + SysConfig sysConfig = configConverter.toEntity(configForm); sysConfig.setUpdateBy(SecurityUtils.getUserId()); return this.updateById(sysConfig); } diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysDeptServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysDeptServiceImpl.java index c2788aa3..f8421f64 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysDeptServiceImpl.java @@ -1,19 +1,19 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.youlai.boot.module.system.converter.DeptConverter; +import com.youlai.boot.module.system.mapper.SysDeptMapper; +import com.youlai.boot.module.system.model.entity.SysDept; +import com.youlai.boot.module.system.model.form.DeptForm; +import com.youlai.boot.module.system.model.query.DeptQuery; +import com.youlai.boot.module.system.model.vo.DeptVO; import com.youlai.system.common.constant.SymbolConstant; import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.enums.StatusEnum; -import com.youlai.system.converter.DeptConverter; -import com.youlai.system.mapper.SysDeptMapper; -import com.youlai.system.model.entity.SysDept; -import com.youlai.system.model.form.DeptForm; -import com.youlai.system.model.query.DeptQuery; -import com.youlai.system.model.vo.DeptVO; import com.youlai.system.common.model.Option; import com.youlai.system.service.SysDeptService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysDictItemServiceImpl.java similarity index 71% rename from src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysDictItemServiceImpl.java index f134999f..c3940651 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysDictItemServiceImpl.java @@ -1,8 +1,8 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.system.mapper.SysDictItemMapper; -import com.youlai.system.model.entity.SysDictItem; +import com.youlai.boot.module.system.mapper.SysDictItemMapper; +import com.youlai.boot.module.system.model.entity.SysDictItem; import com.youlai.system.service.SysDictItemService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysDictServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysDictServiceImpl.java index 839dc9e6..e8be94f1 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysDictServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -6,15 +6,15 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.system.converter.DictConverter; -import com.youlai.system.converter.DictItemConverter; -import com.youlai.system.model.entity.SysDict; -import com.youlai.system.model.entity.SysDictItem; +import com.youlai.boot.module.system.converter.DictConverter; +import com.youlai.boot.module.system.converter.DictItemConverter; +import com.youlai.boot.module.system.mapper.SysDictMapper; +import com.youlai.boot.module.system.model.entity.SysDict; +import com.youlai.boot.module.system.model.entity.SysDictItem; +import com.youlai.boot.module.system.model.form.DictForm; +import com.youlai.boot.module.system.model.query.DictPageQuery; +import com.youlai.boot.module.system.model.vo.DictPageVO; import com.youlai.system.common.model.Option; -import com.youlai.system.mapper.SysDictMapper; -import com.youlai.system.model.form.DictForm; -import com.youlai.system.model.query.DictPageQuery; -import com.youlai.system.model.vo.DictPageVO; import com.youlai.system.service.SysDictItemService; import com.youlai.system.service.SysDictService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysLogServiceImpl.java similarity index 88% rename from src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysLogServiceImpl.java index dddf28d2..f46261c0 100644 --- a/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysLogServiceImpl.java @@ -1,16 +1,15 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.system.util.DateUtils; -import com.youlai.system.model.bo.VisitCount; -import com.youlai.system.model.entity.SysLog; -import com.youlai.system.model.query.LogPageQuery; -import com.youlai.system.model.vo.LogPageVO; -import com.youlai.system.model.vo.VisitStatsVO; -import com.youlai.system.model.vo.VisitTrendVO; +import com.youlai.boot.module.system.mapper.SysLogMapper; +import com.youlai.boot.module.system.model.bo.VisitCount; +import com.youlai.boot.module.system.model.entity.SysLog; +import com.youlai.boot.module.system.model.query.LogPageQuery; +import com.youlai.boot.module.system.model.vo.LogPageVO; +import com.youlai.boot.module.system.model.vo.VisitStatsVO; +import com.youlai.boot.module.system.model.vo.VisitTrendVO; import com.youlai.system.service.SysLogService; -import com.youlai.system.mapper.SysLogMapper; import org.springframework.stereotype.Service; import java.math.BigDecimal; diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysMenuServiceImpl.java similarity index 96% rename from src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysMenuServiceImpl.java index bccde913..7dca8197 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -10,26 +10,25 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.youlai.boot.module.system.converter.MenuConverter; +import com.youlai.boot.module.system.mapper.SysMenuMapper; +import com.youlai.boot.module.system.model.bo.RouteBO; +import com.youlai.boot.module.system.model.entity.GenConfig; +import com.youlai.boot.module.system.model.entity.SysMenu; +import com.youlai.boot.module.system.model.form.MenuForm; +import com.youlai.boot.module.system.model.query.MenuQuery; +import com.youlai.boot.module.system.model.vo.MenuVO; +import com.youlai.boot.module.system.model.vo.RouteVO; import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.enums.MenuTypeEnum; import com.youlai.system.enums.StatusEnum; import com.youlai.system.common.model.KeyValue; import com.youlai.system.common.model.Option; -import com.youlai.system.converter.MenuConverter; -import com.youlai.system.mapper.SysMenuMapper; -import com.youlai.system.model.bo.RouteBO; -import com.youlai.system.model.entity.GenConfig; -import com.youlai.system.model.entity.SysMenu; -import com.youlai.system.model.form.MenuForm; -import com.youlai.system.model.query.MenuQuery; -import com.youlai.system.model.vo.MenuVO; -import com.youlai.system.model.vo.RouteVO; import com.youlai.system.service.SysMenuService; import com.youlai.system.service.SysRoleMenuService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.util.*; diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleMenuServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysRoleMenuServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/SysRoleMenuServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysRoleMenuServiceImpl.java index 16c959c6..b169c0cd 100644 --- a/src/main/java/com/youlai/system/service/impl/SysRoleMenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysRoleMenuServiceImpl.java @@ -1,11 +1,11 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.youlai.boot.module.system.mapper.SysRoleMenuMapper; +import com.youlai.boot.module.system.model.bo.RolePermsBO; +import com.youlai.boot.module.system.model.entity.SysRoleMenu; import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.mapper.SysRoleMenuMapper; -import com.youlai.system.model.bo.RolePermsBO; -import com.youlai.system.model.entity.SysRoleMenu; import com.youlai.system.service.SysRoleMenuService; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysRoleServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysRoleServiceImpl.java index 3a1bda82..6ae11df6 100644 --- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -7,17 +7,16 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.youlai.boot.module.system.converter.RoleConverter; +import com.youlai.boot.module.system.mapper.SysRoleMapper; +import com.youlai.boot.module.system.model.entity.SysRole; +import com.youlai.boot.module.system.model.entity.SysRoleMenu; +import com.youlai.boot.module.system.model.form.RoleForm; +import com.youlai.boot.module.system.model.query.RolePageQuery; +import com.youlai.boot.module.system.model.vo.RolePageVO; import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.common.model.Option; -import com.youlai.system.security.util.SecurityUtils; -import com.youlai.system.converter.RoleConverter; -import com.youlai.system.mapper.SysRoleMapper; -import com.youlai.system.model.entity.SysRole; -import com.youlai.system.model.entity.SysRoleMenu; -import com.youlai.system.model.form.RoleForm; -import com.youlai.system.model.query.RolePageQuery; -import com.youlai.system.model.vo.RolePageVO; -import com.youlai.system.security.service.PermissionService; +import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.system.service.SysRoleMenuService; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; @@ -48,7 +47,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 角色分页列表 * * @param queryParams 角色查询参数 - * @return {@link Page} – 角色分页列表 + * @return {@link Page< RolePageVO >} – 角色分页列表 */ @Override public Page getRolePage(RolePageQuery queryParams) { diff --git a/src/main/java/com/youlai/system/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysUserRoleServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/SysUserRoleServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysUserRoleServiceImpl.java index 782edc7e..a114b95c 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserRoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysUserRoleServiceImpl.java @@ -1,10 +1,10 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.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.system.mapper.SysUserRoleMapper; -import com.youlai.system.model.entity.SysUserRole; +import com.youlai.boot.module.system.mapper.SysUserRoleMapper; +import com.youlai.boot.module.system.model.entity.SysUserRole; import com.youlai.system.service.SysUserRoleService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/SysUserServiceImpl.java similarity index 92% rename from src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/SysUserServiceImpl.java index 16893bc3..25ff7b60 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -8,25 +8,25 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.youlai.boot.module.system.model.form.*; +import com.youlai.boot.system.model.form.*; import com.youlai.system.common.constant.RedisConstants; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.config.property.AliyunSmsProperties; -import com.youlai.system.converter.UserConverter; +import com.youlai.boot.config.property.AliyunSmsProperties; +import com.youlai.boot.module.system.converter.UserConverter; import com.youlai.system.enums.ContactType; -import com.youlai.system.exception.BusinessException; -import com.youlai.system.model.form.*; -import com.youlai.system.model.vo.UserProfileVO; -import com.youlai.system.security.util.SecurityUtils; -import com.youlai.system.mapper.SysUserMapper; -import com.youlai.system.model.dto.UserAuthInfo; -import com.youlai.system.model.bo.UserBO; -import com.youlai.system.model.entity.SysUser; -import com.youlai.system.model.query.UserPageQuery; -import com.youlai.system.model.dto.UserExportDTO; -import com.youlai.system.model.vo.UserInfoVO; -import com.youlai.system.model.vo.UserPageVO; -import com.youlai.system.security.service.PermissionService; -import com.youlai.system.service.*; +import com.youlai.boot.common.exception.BusinessException; +import com.youlai.boot.module.system.model.vo.UserProfileVO; +import com.youlai.boot.framework.security.util.SecurityUtils; +import com.youlai.boot.module.system.mapper.SysUserMapper; +import com.youlai.boot.module.system.model.dto.UserAuthInfo; +import com.youlai.boot.module.system.model.bo.UserBO; +import com.youlai.boot.module.system.model.entity.SysUser; +import com.youlai.boot.module.system.model.query.UserPageQuery; +import com.youlai.boot.module.system.model.dto.UserExportDTO; +import com.youlai.boot.module.system.model.vo.UserInfoVO; +import com.youlai.boot.module.system.model.vo.UserPageVO; +import com.youlai.boot.framework.security.service.PermissionService; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/com/youlai/system/service/impl/WebsocketServiceImpl.java b/src/main/java/com/youlai/boot/module/system/service/impl/WebsocketServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/WebsocketServiceImpl.java rename to src/main/java/com/youlai/boot/module/system/service/impl/WebsocketServiceImpl.java index 8593761e..a39d2360 100644 --- a/src/main/java/com/youlai/system/service/impl/WebsocketServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/system/service/impl/WebsocketServiceImpl.java @@ -1,6 +1,6 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.module.system.service.impl; -import com.youlai.system.event.UserConnectionEvent; +import com.youlai.boot.module.system.event.UserConnectionEvent; import com.youlai.system.service.WebsocketService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/system/plugin/mybatis/handler/MyDataPermissionHandler.java b/src/main/java/com/youlai/system/plugin/mybatis/handler/MyDataPermissionHandler.java deleted file mode 100644 index 28200d8b..00000000 --- a/src/main/java/com/youlai/system/plugin/mybatis/handler/MyDataPermissionHandler.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.youlai.system.plugin.mybatis.handler; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; -import com.youlai.system.plugin.mybatis.annotation.DataPermission; -import com.youlai.system.common.base.IBaseEnum; -import com.youlai.system.enums.DataScopeEnum; -import com.youlai.system.security.util.SecurityUtils; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.operators.conditional.AndExpression; -import net.sf.jsqlparser.parser.CCJSqlParserUtil; - -import java.lang.reflect.Method; - -/** - * 数据权限控制器 - * - * @author zc - * @since 2021-12-10 13:28 - */ -@Slf4j -public class MyDataPermissionHandler implements DataPermissionHandler { - - @Override - @SneakyThrows - public Expression getSqlSegment(Expression where, String mappedStatementId) { - - Class clazz = Class.forName(mappedStatementId.substring(0, mappedStatementId.lastIndexOf(StringPool.DOT))); - String methodName = mappedStatementId.substring(mappedStatementId.lastIndexOf(StringPool.DOT) + 1); - Method[] methods = clazz.getDeclaredMethods(); - for (Method method : methods) { - if (method.getName().equals(methodName)) { - DataPermission annotation = method.getAnnotation(DataPermission.class); - // 如果没有注解或者是超级管理员，直接返回 - if (annotation == null || SecurityUtils.isRoot() ) { - return where; - } - return dataScopeFilter(annotation.deptAlias(), annotation.deptIdColumnName(), annotation.userAlias(), annotation.userIdColumnName(), where); - } - } - return where; - } - - /** - * 构建过滤条件 - * - * @param where 当前查询条件 - * @return 构建后查询条件 - */ - @SneakyThrows - public static Expression dataScopeFilter(String deptAlias, String deptIdColumnName, String userAlias, String userIdColumnName, Expression where) { - - - String deptColumnName = StrUtil.isNotBlank(deptAlias) ? (deptAlias + StringPool.DOT + deptIdColumnName) : deptIdColumnName; - String userColumnName = StrUtil.isNotBlank(userAlias) ? (userAlias + StringPool.DOT + userIdColumnName) : userIdColumnName; - - // 获取当前用户的数据权限 - Integer dataScope = SecurityUtils.getDataScope(); - - DataScopeEnum dataScopeEnum = IBaseEnum.getEnumByValue(dataScope, DataScopeEnum.class); - - Long deptId, userId; - String appendSqlStr; - switch (dataScopeEnum) { - case ALL: - return where; - case DEPT: - deptId = SecurityUtils.getDeptId(); - appendSqlStr = deptColumnName + StringPool.EQUALS + deptId; - break; - case SELF: - userId = SecurityUtils.getUserId(); - appendSqlStr = userColumnName + StringPool.EQUALS + userId; - break; - // 默认部门及子部门数据权限 - default: - deptId = SecurityUtils.getDeptId(); - appendSqlStr = deptColumnName + " IN ( SELECT id FROM sys_dept WHERE id = " + deptId + " OR FIND_IN_SET( " + deptId + " , tree_path ) )"; - break; - } - - if (StrUtil.isBlank(appendSqlStr)) { - return where; - } - - Expression appendExpression = CCJSqlParserUtil.parseCondExpression(appendSqlStr); - - if (where == null) { - return appendExpression; - } - - return new AndExpression(where, appendExpression); - } - - -} - diff --git a/src/main/java/com/youlai/system/plugin/mybatis/handler/MyMetaObjectHandler.java b/src/main/java/com/youlai/system/plugin/mybatis/handler/MyMetaObjectHandler.java deleted file mode 100644 index 091f543a..00000000 --- a/src/main/java/com/youlai/system/plugin/mybatis/handler/MyMetaObjectHandler.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.youlai.system.plugin.mybatis.handler; - -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import org.apache.ibatis.reflection.MetaObject; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -/** - * mybatis-plus 字段自动填充 - * - * @author haoxr - * @since 2022/10/14 - */ -@Component -public class MyMetaObjectHandler implements MetaObjectHandler { - - /** - * 新增填充创建时间 - * - * @param metaObject 元数据 - */ - @Override - public void insertFill(MetaObject metaObject) { - this.strictInsertFill(metaObject, "createTime", LocalDateTime::now, LocalDateTime.class); - this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); - } - - /** - * 更新填充更新时间 - * - * @param metaObject 元数据 - */ - @Override - public void updateFill(MetaObject metaObject) { - this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); - } - -} diff --git a/src/main/resources/mapper/DatabaseMapper.xml b/src/main/resources/mapper/DatabaseMapper.xml index 62858bc8..92ab0a40 100644 --- a/src/main/resources/mapper/DatabaseMapper.xml +++ b/src/main/resources/mapper/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/GenConfigMapper.xml b/src/main/resources/mapper/GenConfigMapper.xml index ba394cd3..705e57f3 100644 --- a/src/main/resources/mapper/GenConfigMapper.xml +++ b/src/main/resources/mapper/GenConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/GenFieldConfigMapper.xml b/src/main/resources/mapper/GenFieldConfigMapper.xml index 475c8cf1..44fb3976 100644 --- a/src/main/resources/mapper/GenFieldConfigMapper.xml +++ b/src/main/resources/mapper/GenFieldConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/SysConfigMapper.xml b/src/main/resources/mapper/SysConfigMapper.xml index 5445cd47..bfb47401 100644 --- a/src/main/resources/mapper/SysConfigMapper.xml +++ b/src/main/resources/mapper/SysConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/SysDeptMapper.xml b/src/main/resources/mapper/SysDeptMapper.xml index 17da0ce3..98bccf92 100644 --- a/src/main/resources/mapper/SysDeptMapper.xml +++ b/src/main/resources/mapper/SysDeptMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/SysDictItemMapper.xml b/src/main/resources/mapper/SysDictItemMapper.xml index 4bf9d397..342b35d9 100644 --- a/src/main/resources/mapper/SysDictItemMapper.xml +++ b/src/main/resources/mapper/SysDictItemMapper.xml @@ -2,10 +2,10 @@ - + - SELECT id, `name`, diff --git a/src/main/resources/mapper/SysDictMapper.xml b/src/main/resources/mapper/SysDictMapper.xml index 468a54af..10df21ff 100644 --- a/src/main/resources/mapper/SysDictMapper.xml +++ b/src/main/resources/mapper/SysDictMapper.xml @@ -2,13 +2,13 @@ - + - + + select="com.youlai.boot.module.system.mapper.SysDictItemMapper.listDictItemsByDictId"> diff --git a/src/main/resources/mapper/SysLogMapper.xml b/src/main/resources/mapper/SysLogMapper.xml index dc25ae32..63d8fd3d 100644 --- a/src/main/resources/mapper/SysLogMapper.xml +++ b/src/main/resources/mapper/SysLogMapper.xml @@ -2,10 +2,10 @@ - + - SELECT t1.id, t1.module, @@ -48,7 +48,7 @@ - SELECT COUNT(1) AS count, DATE_FORMAT(create_time,'%Y-%m-%d') AS date @@ -61,7 +61,7 @@ - SELECT COUNT(DISTINCT ip) AS count, DATE_FORMAT(create_time, '%Y-%m-%d') AS date @@ -74,7 +74,7 @@ - SELECT COUNT(CASE WHEN DATE(create_time) = CURDATE() THEN 1 END) AS todayCount, COUNT(*) AS totalCount, @@ -94,7 +94,7 @@ - SELECT COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() THEN ip END) AS todayCount, COUNT(DISTINCT ip) AS totalCount, diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index df7ed021..4aa6cda1 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -2,10 +2,10 @@ - + - + diff --git a/src/main/resources/mapper/SysRoleMapper.xml b/src/main/resources/mapper/SysRoleMapper.xml index 7fd085c8..df315629 100644 --- a/src/main/resources/mapper/SysRoleMapper.xml +++ b/src/main/resources/mapper/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml index c141984d..f5dd7492 100644 --- a/src/main/resources/mapper/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -2,10 +2,10 @@ - + - SELECT u.id, u.username, @@ -53,7 +53,7 @@ - + @@ -66,7 +66,7 @@ + select="com.youlai.boot.module.system.mapper.SysUserRoleMapper.listRoleIdsByUserId" > @@ -90,7 +90,7 @@ - + @@ -120,7 +120,7 @@ - SELECT u.username, u.nickname, @@ -153,7 +153,7 @@ - SELECT u.id, u.username, diff --git a/src/main/resources/mapper/SysUserRoleMapper.xml b/src/main/resources/mapper/SysUserRoleMapper.xml index 343ba25b..bc67393e 100644 --- a/src/main/resources/mapper/SysUserRoleMapper.xml +++ b/src/main/resources/mapper/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - +