diff --git a/README.md b/README.md index 0a7cc4c1..97a1b18b 100644 --- a/README.md +++ b/README.md @@ -43,47 +43,62 @@ ``` youlai-boot ├── sql # SQL脚本 - ├── mysql5 # MySQL5 脚本 - ├── mysql8 # MySQL8 脚本 +│ ├── mysql5 # MySQL5 脚本 +│ └── mysql8 # MySQL8 脚本 ├── src # 源码目录 - ├── common # 公共模块 - ├── config # 自动装配配置 - ├── CorsConfig # 跨域共享配置 - ├── MybatisConfig # Mybatis 自动装配配置 - ├── RedisCacheConfig # Redis 缓存自动装配配置 - ├── RedisConfig # Redis 自动装配配置 - ├── SecurityConfig # Spring Security 自动装配配置 - ├── SwaggerConfig # API 接口文档配置 - ├── WebMvcConfig # WebMvc 配置 - ├── WebSocketConfig # WebSocket 自动装配配置 - ├── XxlJobConfig # XXL-JOB 自动装配配置 - ├── controller # 控制层 - ├── converter # MapStruct 转换器 - ├── filter # 过滤器 - ├── RequestLogFilter # 请求日志过滤器 - ├── VerifyCodeFilter # 验证码过滤器 - ├── model # 模型层 - ├── bo # 业务对象 - ├── dto # 数据传输对象 - ├── entity # 实体对象 - ├── form # 表单对象 - ├── query # 查询参数对象 - ├── vo # 视图对象 - ├── mapper # 数据库访问层 - ├── plugin # 插件(可选) - ├── captcha # 验证码插件，用于生成验证码 - ├── dupsubmit # 防重提交插件，用于防止表单重复提交 - ├── mybatis # Mybatis 插件，数据权限、字段填充 - ├── easyexcel # EasyExcel 插件，Excel 文件的读写 - ├── xxljob # XXL-JOB 插件，分布式任务调度和执行 - ├── security # Spring Security 安全配置和扩展 - ├── util # 工具类 - ├── JwtUtils # JWT 工具类，用于生成和解析 JWT - ├── SecurityUtils # Spring Security 工具类，用于获取当前登录用户 - ├── service # 业务逻辑层 - - -└── end +│ ├── common # 公共模块 +│ │ ├── annotation # 注解定义 +│ │ ├── base # 基础类 +│ │ ├── constant # 常量 +│ │ ├── enums # 枚举类型 +│ │ ├── exception # 异常处理 +│ │ ├── model # 数据模型 +│ │ ├── result # 结果封装 +│ │ └── util # 工具类 +│ ├── config # 自动装配配置 +│ │ ├── CorsConfig # 跨域共享配置 +│ │ ├── MybatisConfig # Mybatis 自动装配配置 +│ │ ├── RedisCacheConfig # Redis 缓存自动装配配置 +│ │ ├── RedisConfig # Redis 自动装配配置 +│ │ ├── SecurityConfig # Spring Security 自动装配配置 +│ │ ├── SwaggerConfig # API 接口文档配置 +│ │ ├── WebMvcConfig # WebMvc 配置 +│ │ ├── WebSocketConfig # WebSocket 自动装配配置 +│ │ └── XxlJobConfig # XXL-JOB 自动装配配置 +│ ├── core # 核心功能模块 +│ │ ├── aspect # 切面 +│ │ │ ├── LogAspect # 日志切面 +│ │ │ └── RepeatSubmitAspect # 防重提交切面 +│ │ ├── filter # 过滤器 +│ │ │ ├── RateLimiterFilter # 限流过滤器 +│ │ │ └── RequestLogFilter # 请求日志过滤器 +│ │ ├── handler # 处理器 +│ │ │ ├── MyDataPermissionHandler # 数据权限处理器 +│ │ │ └── MyMetaObjectHandler # 元对象字段填充处理器 +│ │ └── security # Security 安全中心 +│ ├── platform # 平台基础设施模块 +│ │ ├── auth # 授权 +│ │ ├── file # 文件处理 +│ │ ├── generator # 代码生成器 +│ │ ├── mail # 邮件处理 +│ │ └── sms # 短信处理 +│ ├── system # 系统模块 +│ │ ├── controller # 控制层 +│ │ ├── converter # MapStruct 转换器 +│ │ ├── event # 事件处理 +│ │ ├── handler # 处理器 +│ │ ├── listener # 监听器 +│ │ ├── model # 模型层 +│ │ │ ├── bo # 业务对象 +│ │ │ ├── dto # 数据传输对象 +│ │ │ ├── entity # 实体对象 +│ │ │ ├── form # 表单对象 +│ │ │ ├── query # 查询参数对象 +│ │ │ └── vo # 视图对象 +│ │ ├── mapper # 数据库访问层 +│ │ └── service # 业务逻辑层 +│ └── YouLaiApplication # 启动类 +└── end ``` ## 🌺 前端工程 @@ -111,7 +126,7 @@ youlai-boot 3. **启动项目** - 执行 [SystemApplication.java](src/main/java/com/youlai/system/SystemApplication.java) 的 main 方法完成后端项目启动； + 执行 [SystemApplication.java](src/main/java/com/youlai/boot/YouLaiApplication.java) 的 main 方法完成后端项目启动； 访问接口文档地址 [http://localhost:8989/doc.html](http://localhost:8989/doc.html) 验证项目启动是否成功。 diff --git a/pom.xml b/pom.xml index edb3d2ca..5aa9a62f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.youlai youlai-boot - 2.9.0 + 2.10.0 基于 Java 17 + SpringBoot 3 + Spring Security 构建的权限管理系统。 diff --git a/sql/mysql5/youlai_boot.sql b/sql/mysql5/youlai_boot.sql index 93d5c605..0eed43bd 100644 --- a/sql/mysql5/youlai_boot.sql +++ b/sql/mysql5/youlai_boot.sql @@ -327,7 +327,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); INSERT INTO `sys_menu` VALUES (120, 1, '0,1', '系统配置', 1, 'Config', 'config', 'system/config/index', NULL, 0, 1, 1, 7, 'setting', NULL, '2024-07-30 16:29:24', '2024-07-30 16:29:32', NULL); INSERT INTO `sys_menu` VALUES (121, 120, '0,1,120', '查询系统配置', 4, NULL, '', NULL, 'sys:config:query', 0, 1, 1, 1, '', NULL, '2024-07-30 16:29:54', '2024-07-30 16:29:54', 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/YouLaiApplication.java similarity index 68% rename from src/main/java/com/youlai/system/SystemApplication.java rename to src/main/java/com/youlai/boot/YouLaiApplication.java index 7d844380..e891cb5b 100644 --- a/src/main/java/com/youlai/system/SystemApplication.java +++ b/src/main/java/com/youlai/boot/YouLaiApplication.java @@ -1,15 +1,23 @@ -package com.youlai.system; +package com.youlai.boot; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.scheduling.annotation.EnableScheduling; +/** + * 应用启动类 + * + * @author Ray + * @since 0.0.1 + */ @SpringBootApplication @ConfigurationPropertiesScan @EnableScheduling -public class SystemApplication { +public class YouLaiApplication { + public static void main(String[] args) { - SpringApplication.run(SystemApplication.class, args); + SpringApplication.run(YouLaiApplication.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 86% 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..10f0d00a 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,9 +1,9 @@ -package com.youlai.system.plugin.mybatis.annotation; +package com.youlai.boot.common.annotation; import java.lang.annotation.*; /** - * MP数据权限注解 + * 数据权限注解 * * @author zc * @since 2.0.0 diff --git a/src/main/java/com/youlai/system/plugin/syslog/annotation/LogAnnotation.java b/src/main/java/com/youlai/boot/common/annotation/Log.java similarity index 64% rename from src/main/java/com/youlai/system/plugin/syslog/annotation/LogAnnotation.java rename to src/main/java/com/youlai/boot/common/annotation/Log.java index 7ec75b30..05f267fc 100644 --- a/src/main/java/com/youlai/system/plugin/syslog/annotation/LogAnnotation.java +++ b/src/main/java/com/youlai/boot/common/annotation/Log.java @@ -1,6 +1,6 @@ -package com.youlai.system.plugin.syslog.annotation; +package com.youlai.boot.common.annotation; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.enums.LogModuleEnum; import java.lang.annotation.*; @@ -13,7 +13,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @Documented -public @interface LogAnnotation { +public @interface Log { String value() default ""; diff --git a/src/main/java/com/youlai/system/plugin/norepeat/annotation/PreventRepeatSubmit.java b/src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.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/RepeatSubmit.java index a767e2ee..39c71044 100644 --- a/src/main/java/com/youlai/system/plugin/norepeat/annotation/PreventRepeatSubmit.java +++ b/src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.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 RepeatSubmit { /** * 锁过期时间（秒） 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 86% 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..46373d1b 100644 --- a/src/main/java/com/youlai/system/enums/DataScopeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java @@ -1,6 +1,6 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.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 94% 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..cad7f245 100644 --- a/src/main/java/com/youlai/system/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java @@ -1,9 +1,9 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; 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 84% 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..94a565ae 100644 --- a/src/main/java/com/youlai/system/enums/GenderEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/GenderEnum.java @@ -1,6 +1,6 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; 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 88% 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..66c533cb 100644 --- a/src/main/java/com/youlai/system/enums/MenuTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/MenuTypeEnum.java @@ -1,7 +1,7 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; /** 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 94% 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..0428f4f0 100644 --- a/src/main/java/com/youlai/system/enums/QueryTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java @@ -1,9 +1,9 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; 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 82% 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..4d767c83 100644 --- a/src/main/java/com/youlai/system/enums/StatusEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/StatusEnum.java @@ -1,6 +1,6 @@ -package com.youlai.system.enums; +package com.youlai.boot.common.enums; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.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 98% 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..513aec40 100644 --- a/src/main/java/com/youlai/system/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ -package com.youlai.system.exception; +package com.youlai.boot.common.exception; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.core.JsonProcessingException; -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 lombok.extern.slf4j.Slf4j; import org.springframework.beans.TypeMismatchException; import org.springframework.context.support.DefaultMessageSourceResolvable; 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/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 89% rename from src/main/java/com/youlai/system/config/MybatisConfig.java rename to src/main/java/com/youlai/boot/config/MybatisConfig.java index 4e34436d..e6cb1dac 100644 --- a/src/main/java/com/youlai/system/config/MybatisConfig.java +++ b/src/main/java/com/youlai/boot/config/MybatisConfig.java @@ -1,12 +1,12 @@ -package com.youlai.system.config; +package com.youlai.boot.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.youlai.system.plugin.mybatis.handler.MyDataPermissionHandler; -import com.youlai.system.plugin.mybatis.handler.MyMetaObjectHandler; +import com.youlai.boot.core.handler.MyDataPermissionHandler; +import com.youlai.boot.core.handler.MyMetaObjectHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; 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..88e4d375 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.core.filter.RateLimiterFilter; +import com.youlai.boot.core.security.exception.MyAccessDeniedHandler; +import com.youlai.boot.core.security.exception.MyAuthenticationEntryPoint; +import com.youlai.boot.core.security.filter.JwtValidationFilter; +import com.youlai.boot.core.security.filter.CaptchaValidationFilter; +import com.youlai.boot.system.service.ConfigService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -45,9 +45,7 @@ public class SecurityConfig { private final RedisTemplate redisTemplate; private final CodeGenerator codeGenerator; private final SecurityProperties securityProperties; - private final SysConfigService sysConfigService; - - + private final ConfigService configService; @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { @@ -68,7 +66,7 @@ public class SecurityConfig { ; // 限流过滤器 - http.addFilterBefore(new RedisRateLimiterFilter(redisTemplate, sysConfigService), UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore(new RateLimiterFilter(redisTemplate, configService), 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 95% rename from src/main/java/com/youlai/system/config/SwaggerConfig.java rename to src/main/java/com/youlai/boot/config/SwaggerConfig.java index 95ccb7c5..2c4b0b93 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; @@ -68,7 +68,7 @@ public class SwaggerConfig { if (openApi.getPaths() != null) { openApi.getPaths().forEach((s, pathItem) -> { // 登录接口/验证码不需要添加鉴权参数 - if (s.equals("/api/v1/auth/login") || s.equals("/api/v1/auth/captcha")) { + if ("/api/v1/auth/login".equals(s) || "/api/v1/auth/captcha".equals(s)) { return; } // 接口添加鉴权参数 diff --git a/src/main/java/com/youlai/system/config/WebMvcConfig.java b/src/main/java/com/youlai/boot/config/WebMvcConfig.java similarity index 96% rename from src/main/java/com/youlai/system/config/WebMvcConfig.java rename to src/main/java/com/youlai/boot/config/WebMvcConfig.java index 6dee3948..59aa3716 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; @@ -21,9 +21,7 @@ import org.springframework.validation.beanvalidation.SpringConstraintValidatorFa import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.math.BigInteger; -import java.text.SimpleDateFormat; import java.util.List; -import java.util.TimeZone; /** * WebMvc 自动装配配置 diff --git a/src/main/java/com/youlai/system/config/WebSocketConfig.java b/src/main/java/com/youlai/boot/config/WebSocketConfig.java similarity index 93% rename from src/main/java/com/youlai/system/config/WebSocketConfig.java rename to src/main/java/com/youlai/boot/config/WebSocketConfig.java index 815b8841..bd65c941 100644 --- a/src/main/java/com/youlai/system/config/WebSocketConfig.java +++ b/src/main/java/com/youlai/boot/config/WebSocketConfig.java @@ -1,16 +1,12 @@ -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.system.service.WebsocketService; -import groovy.lang.Lazy; -import lombok.RequiredArgsConstructor; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.system.event.UserConnectionEvent; 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/core/aspect/LogAspect.java similarity index 83% rename from src/main/java/com/youlai/system/plugin/syslog/aspect/LogAspect.java rename to src/main/java/com/youlai/boot/core/aspect/LogAspect.java index f103766c..077e68f9 100644 --- a/src/main/java/com/youlai/system/plugin/syslog/aspect/LogAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java @@ -1,16 +1,15 @@ -package com.youlai.system.plugin.syslog.aspect; +package com.youlai.boot.core.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.system.model.entity.Log; +import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.system.service.LogService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -32,15 +31,15 @@ import org.springframework.stereotype.Component; @Slf4j public class LogAspect { - private final SysLogService logService; + private final LogService logService; private final HttpServletRequest request; - @Pointcut("@annotation(com.youlai.system.plugin.syslog.annotation.LogAnnotation)") + @Pointcut("@annotation(com.youlai.boot.common.annotation.Log)") public void logPointcut() { } @Around("logPointcut() && @annotation(logAnnotation)") - public Object logExecutionTime(ProceedingJoinPoint joinPoint, LogAnnotation logAnnotation) throws Throwable { + public Object logExecutionTime(ProceedingJoinPoint joinPoint, com.youlai.boot.common.annotation.Log logAnnotation) throws Throwable { String requestURI = request.getRequestURI(); Long userId = null; @@ -55,7 +54,7 @@ public class LogAspect { long executionTime = timer.interval(); // 创建日志记录 - SysLog log = new SysLog(); + Log log = new Log(); log.setModule(logAnnotation.module()); log.setContent(logAnnotation.value()); log.setRequestUri(requestURI); diff --git a/src/main/java/com/youlai/system/plugin/norepeat/aspect/DuplicateSubmitAspect.java b/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.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/core/aspect/RepeatSubmitAspect.java index 6f0d1d73..dbf783a2 100644 --- a/src/main/java/com/youlai/system/plugin/norepeat/aspect/DuplicateSubmitAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java @@ -1,13 +1,13 @@ -package com.youlai.system.plugin.norepeat.aspect; +package com.youlai.boot.core.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.RepeatSubmit; 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 RepeatSubmitAspect { private final RedissonClient redissonClient; /** * 防重复提交切点 */ - @Pointcut("@annotation(preventRepeatSubmit)") - public void preventDuplicateSubmitPointCut(PreventRepeatSubmit preventRepeatSubmit) { + @Pointcut("@annotation(repeatSubmit)") + public void preventDuplicateSubmitPointCut(RepeatSubmit repeatSubmit) { log.info("定义防重复提交切点"); } - @Around("preventDuplicateSubmitPointCut(preventRepeatSubmit)") - public Object doAround(ProceedingJoinPoint pjp, PreventRepeatSubmit preventRepeatSubmit) throws Throwable { + @Around("preventDuplicateSubmitPointCut(repeatSubmit)") + public Object doAround(ProceedingJoinPoint pjp, RepeatSubmit repeatSubmit) throws Throwable { String resubmitLockKey = generateResubmitLockKey(); if (resubmitLockKey != null) { - int expire = preventRepeatSubmit.expire(); // 防重提交锁过期时间 + int expire = repeatSubmit.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/core/filter/RateLimiterFilter.java similarity index 78% rename from src/main/java/com/youlai/system/filter/RedisRateLimiterFilter.java rename to src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java index 30ff59a0..62de5609 100644 --- a/src/main/java/com/youlai/system/filter/RedisRateLimiterFilter.java +++ b/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java @@ -1,10 +1,10 @@ -package com.youlai.system.filter; +package com.youlai.boot.core.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.system.service.ConfigService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -24,14 +24,14 @@ 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; + private final ConfigService configService; - public RedisRateLimiterFilter(RedisTemplate redisTemplate, SysConfigService sysConfigService) { + public RateLimiterFilter(RedisTemplate redisTemplate, ConfigService configService) { this.redisTemplate = redisTemplate; - this.sysConfigService = sysConfigService; + this.configService = configService; } /** @@ -48,7 +48,7 @@ public class RedisRateLimiterFilter extends OncePerRequestFilter { if (count == null || count == 1) { redisTemplate.expire(key,1, TimeUnit.SECONDS); } - Object systemConfig = sysConfigService.getSystemConfig(RedisConstants.IP_QPS_THRESHOLD_LIMIT_KEY); + Object systemConfig = configService.getSystemConfig(RedisConstants.IP_QPS_THRESHOLD_LIMIT_KEY); long limit = 10; if(systemConfig != null){ limit = Long.parseLong(systemConfig.toString()); diff --git a/src/main/java/com/youlai/system/filter/RequestLogFilter.java b/src/main/java/com/youlai/boot/core/filter/RequestLogFilter.java similarity index 96% rename from src/main/java/com/youlai/system/filter/RequestLogFilter.java rename to src/main/java/com/youlai/boot/core/filter/RequestLogFilter.java index 0a968789..d8942efa 100644 --- a/src/main/java/com/youlai/system/filter/RequestLogFilter.java +++ b/src/main/java/com/youlai/boot/core/filter/RequestLogFilter.java @@ -1,4 +1,4 @@ -package com.youlai.system.filter; +package com.youlai.boot.core.filter; import jakarta.servlet.http.HttpServletRequest; 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/boot/core/handler/MyDataPermissionHandler.java similarity index 92% rename from src/main/java/com/youlai/system/plugin/mybatis/handler/MyDataPermissionHandler.java rename to src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java index 28200d8b..6995b0c0 100644 --- a/src/main/java/com/youlai/system/plugin/mybatis/handler/MyDataPermissionHandler.java +++ b/src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java @@ -1,12 +1,12 @@ -package com.youlai.system.plugin.mybatis.handler; +package com.youlai.boot.core.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 com.youlai.boot.common.annotation.DataPermission; +import com.youlai.boot.common.base.IBaseEnum; +import com.youlai.boot.common.enums.DataScopeEnum; +import com.youlai.boot.core.security.util.SecurityUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; diff --git a/src/main/java/com/youlai/system/plugin/mybatis/handler/MyMetaObjectHandler.java b/src/main/java/com/youlai/boot/core/handler/MyMetaObjectHandler.java similarity index 95% rename from src/main/java/com/youlai/system/plugin/mybatis/handler/MyMetaObjectHandler.java rename to src/main/java/com/youlai/boot/core/handler/MyMetaObjectHandler.java index 091f543a..22973a52 100644 --- a/src/main/java/com/youlai/system/plugin/mybatis/handler/MyMetaObjectHandler.java +++ b/src/main/java/com/youlai/boot/core/handler/MyMetaObjectHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.mybatis.handler; +package com.youlai.boot.core.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java similarity index 83% rename from src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java rename to src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java index 484b24ee..60f9041b 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java +++ b/src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java @@ -1,7 +1,7 @@ -package com.youlai.system.security.exception; +package com.youlai.boot.core.security.exception; -import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.boot.common.result.ResultCode; +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/core/security/exception/MyAuthenticationEntryPoint.java similarity index 90% rename from src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java rename to src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java index 28552173..9f3c144e 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ -package com.youlai.system.security.exception; +package com.youlai.boot.core.security.exception; -import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.boot.common.result.ResultCode; +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/core/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/core/security/filter/CaptchaValidationFilter.java index 291570ba..095be092 100644 --- a/src/main/java/com/youlai/system/filter/CaptchaValidationFilter.java +++ b/src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java @@ -1,10 +1,10 @@ -package com.youlai.system.filter; +package com.youlai.boot.core.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/core/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/core/security/filter/JwtValidationFilter.java index b6aa64e0..17403cc7 100644 --- a/src/main/java/com/youlai/system/filter/JwtValidationFilter.java +++ b/src/main/java/com/youlai/boot/core/security/filter/JwtValidationFilter.java @@ -1,14 +1,14 @@ -package com.youlai.system.filter; +package com.youlai.boot.core.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.core.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/core/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/core/security/model/SysUserDetails.java index e6b36825..e7801e8e 100644 --- a/src/main/java/com/youlai/system/security/model/SysUserDetails.java +++ b/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java @@ -1,8 +1,8 @@ -package com.youlai.system.security.model; +package com.youlai.boot.core.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.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/core/security/service/PermissionService.java similarity index 94% rename from src/main/java/com/youlai/system/security/service/PermissionService.java rename to src/main/java/com/youlai/boot/core/security/service/PermissionService.java index 7f6f4021..363bcd6c 100644 --- a/src/main/java/com/youlai/system/security/service/PermissionService.java +++ b/src/main/java/com/youlai/boot/core/security/service/PermissionService.java @@ -1,9 +1,9 @@ -package com.youlai.system.security.service; +package com.youlai.boot.core.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.common.constant.SecurityConstants; +import com.youlai.boot.core.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/core/security/service/SysUserDetailsService.java similarity index 78% rename from src/main/java/com/youlai/system/security/service/SysUserDetailsService.java rename to src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java index 4dbb84ff..577d2044 100644 --- a/src/main/java/com/youlai/system/security/service/SysUserDetailsService.java +++ b/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java @@ -1,8 +1,8 @@ -package com.youlai.system.security.service; +package com.youlai.boot.core.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.core.security.model.SysUserDetails; +import com.youlai.boot.system.model.dto.UserAuthInfo; +import com.youlai.boot.system.service.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetails; @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; @Slf4j public class SysUserDetailsService implements UserDetailsService { - private final SysUserService sysUserService; + private final UserService userService; /** * 根据用户名获取用户信息 @@ -33,7 +33,7 @@ public class SysUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { try { - UserAuthInfo userAuthInfo = sysUserService.getUserAuthInfo(username); + UserAuthInfo userAuthInfo = userService.getUserAuthInfo(username); if (userAuthInfo == null) { throw new UsernameNotFoundException(username); } diff --git a/src/main/java/com/youlai/system/security/util/JwtUtils.java b/src/main/java/com/youlai/boot/core/security/util/JwtUtils.java similarity index 95% rename from src/main/java/com/youlai/system/security/util/JwtUtils.java rename to src/main/java/com/youlai/boot/core/security/util/JwtUtils.java index 49cc845f..aef6df32 100644 --- a/src/main/java/com/youlai/system/security/util/JwtUtils.java +++ b/src/main/java/com/youlai/boot/core/security/util/JwtUtils.java @@ -1,4 +1,4 @@ -package com.youlai.system.security.util; +package com.youlai.boot.core.security.util; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; @@ -6,8 +6,8 @@ import cn.hutool.core.util.IdUtil; 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.common.constant.JwtClaimConstants; +import com.youlai.boot.core.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/core/security/util/SecurityUtils.java similarity index 94% rename from src/main/java/com/youlai/system/security/util/SecurityUtils.java rename to src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java index 2b0550a1..e78c0e01 100644 --- a/src/main/java/com/youlai/system/security/util/SecurityUtils.java +++ b/src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java @@ -1,9 +1,9 @@ -package com.youlai.system.security.util; +package com.youlai.boot.core.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.common.constant.SystemConstants; +import com.youlai.boot.core.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/AuthController.java b/src/main/java/com/youlai/boot/platform/auth/controller/AuthController.java similarity index 73% rename from src/main/java/com/youlai/system/controller/AuthController.java rename to src/main/java/com/youlai/boot/platform/auth/controller/AuthController.java index 51685c32..a8843830 100644 --- a/src/main/java/com/youlai/system/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/platform/auth/controller/AuthController.java @@ -1,11 +1,11 @@ -package com.youlai.system.controller; +package com.youlai.boot.platform.auth.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.system.service.AuthService; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.platform.auth.service.AuthService; +import com.youlai.boot.system.model.dto.CaptchaResult; +import com.youlai.boot.system.model.dto.LoginResult; +import com.youlai.boot.common.annotation.Log; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -30,7 +30,7 @@ public class AuthController { @Operation(summary = "登录") @PostMapping("/login") - @LogAnnotation(value = "登录", module = LogModuleEnum.LOGIN) + @Log(value = "登录", module = LogModuleEnum.LOGIN) public Result login( @Parameter(description = "用户名", example = "admin") @RequestParam String username, @Parameter(description = "密码", example = "123456") @RequestParam String password @@ -41,7 +41,7 @@ public class AuthController { @Operation(summary = "注销") @DeleteMapping("/logout") - @LogAnnotation(value = "注销", module = LogModuleEnum.LOGIN) + @Log(value = "注销", module = LogModuleEnum.LOGIN) public Result logout() { authService.logout(); return Result.success(); diff --git a/src/main/java/com/youlai/system/service/AuthService.java b/src/main/java/com/youlai/boot/platform/auth/service/AuthService.java similarity index 73% rename from src/main/java/com/youlai/system/service/AuthService.java rename to src/main/java/com/youlai/boot/platform/auth/service/AuthService.java index 40c6c4bb..87f713b0 100644 --- a/src/main/java/com/youlai/system/service/AuthService.java +++ b/src/main/java/com/youlai/boot/platform/auth/service/AuthService.java @@ -1,7 +1,7 @@ -package com.youlai.system.service; +package com.youlai.boot.platform.auth.service; -import com.youlai.system.model.dto.CaptchaResult; -import com.youlai.system.model.dto.LoginResult; +import com.youlai.boot.system.model.dto.CaptchaResult; +import com.youlai.boot.system.model.dto.LoginResult; /** * 认证服务接口 diff --git a/src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/platform/auth/service/impl/AuthServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java rename to src/main/java/com/youlai/boot/platform/auth/service/impl/AuthServiceImpl.java index 1013fa29..ae403956 100644 --- a/src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/auth/service/impl/AuthServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.platform.auth.service.impl; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CaptchaUtil; @@ -8,13 +8,13 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; 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.system.service.AuthService; -import com.youlai.system.security.util.JwtUtils; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.common.enums.CaptchaTypeEnum; +import com.youlai.boot.platform.auth.service.AuthService; +import com.youlai.boot.system.model.dto.CaptchaResult; +import com.youlai.boot.system.model.dto.LoginResult; +import com.youlai.boot.config.property.CaptchaProperties; +import com.youlai.boot.core.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/controller/FileController.java b/src/main/java/com/youlai/boot/platform/file/controller/FileController.java similarity index 62% rename from src/main/java/com/youlai/system/controller/FileController.java rename to src/main/java/com/youlai/boot/platform/file/controller/FileController.java index e641abe1..1b5123ee 100644 --- a/src/main/java/com/youlai/system/controller/FileController.java +++ b/src/main/java/com/youlai/boot/platform/file/controller/FileController.java @@ -1,8 +1,8 @@ -package com.youlai.system.controller; +package com.youlai.boot.platform.file.controller; -import com.youlai.system.common.result.Result; -import com.youlai.system.model.dto.FileInfo; -import com.youlai.system.service.OssService; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.platform.file.service.FileService; +import com.youlai.boot.system.model.dto.FileInfo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; @@ -25,15 +25,21 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor public class FileController { - private final OssService ossService; + private final FileService fileService; @PostMapping @Operation(summary = "文件上传") public Result uploadFile( - @Parameter(name = "file", description = "表单文件对象", required = true, in = ParameterIn.DEFAULT, schema = @Schema(name = "file", format = "binary")) + @Parameter( + name = "file", + description = "表单文件对象", + required = true, + in = ParameterIn.DEFAULT, + schema = @Schema(name = "file", format = "binary") + ) @RequestPart(value = "file") MultipartFile file ) { - FileInfo fileInfo = ossService.uploadFile(file); + FileInfo fileInfo = fileService.uploadFile(file); return Result.success(fileInfo); } @@ -43,7 +49,7 @@ public class FileController { public Result deleteFile( @Parameter(description = "文件路径") @RequestParam String filePath ) { - boolean result = ossService.deleteFile(filePath); + boolean result = fileService.deleteFile(filePath); return Result.judge(result); } } diff --git a/src/main/java/com/youlai/system/service/OssService.java b/src/main/java/com/youlai/boot/platform/file/service/FileService.java similarity index 77% rename from src/main/java/com/youlai/system/service/OssService.java rename to src/main/java/com/youlai/boot/platform/file/service/FileService.java index 04875d1a..a1aabb45 100644 --- a/src/main/java/com/youlai/system/service/OssService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/FileService.java @@ -1,6 +1,6 @@ -package com.youlai.system.service; +package com.youlai.boot.platform.file.service; -import com.youlai.system.model.dto.FileInfo; +import com.youlai.boot.system.model.dto.FileInfo; import org.springframework.web.multipart.MultipartFile; /** @@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile; * @author haoxr * @since 2022/11/19 */ -public interface OssService { +public interface FileService { /** * 上传文件 diff --git a/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java b/src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java rename to src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java index 5062713f..b3811f25 100644 --- a/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl.oss; +package com.youlai.boot.platform.file.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -8,8 +8,8 @@ import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; -import com.youlai.system.model.dto.FileInfo; -import com.youlai.system.service.OssService; +import com.youlai.boot.platform.file.service.FileService; +import com.youlai.boot.system.model.dto.FileInfo; import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; @@ -33,7 +33,7 @@ import java.time.LocalDateTime; @ConfigurationProperties(prefix = "oss.aliyun") @RequiredArgsConstructor @Data -public class AliyunOssService implements OssService { +public class AliyunFileService implements FileService { /** * 服务Endpoint */ diff --git a/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java b/src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java similarity index 95% rename from src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java rename to src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java index 00eb327a..83bbbdd3 100644 --- a/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java @@ -1,12 +1,12 @@ -package com.youlai.system.service.impl.oss; +package com.youlai.boot.platform.file.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.system.service.OssService; +import com.youlai.boot.platform.file.service.FileService; +import com.youlai.boot.system.model.dto.FileInfo; import io.minio.*; import io.minio.errors.*; import io.minio.http.Method; @@ -36,7 +36,7 @@ import java.time.LocalDateTime; @ConfigurationProperties(prefix = "oss.minio") @RequiredArgsConstructor @Data -public class MinioOssService implements OssService { +public class MinioFileService implements FileService { /** * 服务Endpoint @@ -102,7 +102,8 @@ public class MinioOssService implements OssService { // 返回文件路径 String fileUrl; - if (StrUtil.isBlank(customDomain)) { // 未配置自定义域名 + // 未配置自定义域名 + if (StrUtil.isBlank(customDomain)) { GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs.builder() .bucket(bucketName).object(fileName) .method(Method.GET) diff --git a/src/main/java/com/youlai/system/controller/GeneratorController.java b/src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java similarity index 78% rename from src/main/java/com/youlai/system/controller/GeneratorController.java rename to src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java index 7a5e5f5e..a7407459 100644 --- a/src/main/java/com/youlai/system/controller/GeneratorController.java +++ b/src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java @@ -1,16 +1,16 @@ -package com.youlai.system.controller; +package com.youlai.boot.platform.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.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.system.service.GeneratorService; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.config.property.GeneratorProperties; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.platform.generator.service.GeneratorService; +import com.youlai.boot.platform.generator.model.form.GenConfigForm; +import com.youlai.boot.system.model.query.TablePageQuery; +import com.youlai.boot.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.system.model.vo.TablePageVO; +import com.youlai.boot.common.annotation.Log; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -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; @@ -42,7 +41,7 @@ public class GeneratorController { @Operation(summary = "获取数据表分页列表") @GetMapping("/table/page") - @LogAnnotation(value = "代码生成分页列表", module = LogModuleEnum.OTHER) + @Log(value = "代码生成分页列表", module = LogModuleEnum.OTHER) public PageResult getTablePage( TablePageQuery queryParams ) { @@ -61,7 +60,7 @@ public class GeneratorController { @Operation(summary = "保存代码生成配置") @PostMapping("/{tableName}/config") - @LogAnnotation(value = "生成代码", module = LogModuleEnum.OTHER) + @Log(value = "生成代码", module = LogModuleEnum.OTHER) public Result saveGenConfig(@RequestBody GenConfigForm formData) { generatorService.saveGenConfig(formData); return Result.success(); @@ -78,7 +77,7 @@ public class GeneratorController { @Operation(summary = "获取预览生成代码") @GetMapping("/{tableName}/preview") - @LogAnnotation(value = "预览生成代码", module = LogModuleEnum.OTHER) + @Log(value = "预览生成代码", module = LogModuleEnum.OTHER) public Result> getTablePreviewData(@PathVariable String tableName) { List list = generatorService.getTablePreviewData(tableName); return Result.success(list); @@ -86,7 +85,7 @@ public class GeneratorController { @Operation(summary = "下载代码") @GetMapping("/{tableName}/download") - @LogAnnotation(value = "下载代码", module = LogModuleEnum.OTHER) + @Log(value = "下载代码", module = LogModuleEnum.OTHER) public void downloadZip(HttpServletResponse response, @PathVariable String tableName) throws IOException { String[] tableNames = tableName.split(","); byte[] data = generatorService.downloadCode(tableNames); diff --git a/src/main/java/com/youlai/system/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java similarity index 52% rename from src/main/java/com/youlai/system/mapper/DatabaseMapper.java rename to src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java index 0d66875f..a1968f8f 100644 --- a/src/main/java/com/youlai/system/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java @@ -1,25 +1,24 @@ -package com.youlai.system.mapper; +package com.youlai.boot.platform.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.system.model.bo.ColumnMetaData; +import com.youlai.boot.system.model.bo.TableMetaData; +import com.youlai.boot.system.model.entity.Dept; +import com.youlai.boot.system.model.query.TablePageQuery; +import com.youlai.boot.system.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface DatabaseMapper extends BaseMapper { +public interface DatabaseMapper extends BaseMapper { Page getTablePage(Page page, TablePageQuery queryParams); List getTableColumns(String tableName); - TableMetaData getTableMetadata(String tableName); } diff --git a/src/main/java/com/youlai/system/mapper/GenConfigMapper.java b/src/main/java/com/youlai/boot/platform/generator/mapper/GenConfigMapper.java similarity index 69% rename from src/main/java/com/youlai/system/mapper/GenConfigMapper.java rename to src/main/java/com/youlai/boot/platform/generator/mapper/GenConfigMapper.java index a307568e..9e973c2a 100644 --- a/src/main/java/com/youlai/system/mapper/GenConfigMapper.java +++ b/src/main/java/com/youlai/boot/platform/generator/mapper/GenConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.platform.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.GenConfig; +import com.youlai.boot.platform.generator.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/platform/generator/mapper/GenFieldConfigMapper.java similarity index 69% rename from src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java rename to src/main/java/com/youlai/boot/platform/generator/mapper/GenFieldConfigMapper.java index 258d11a4..43607c50 100644 --- a/src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java +++ b/src/main/java/com/youlai/boot/platform/generator/mapper/GenFieldConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.platform.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/system/model/entity/GenConfig.java b/src/main/java/com/youlai/boot/platform/generator/model/entity/GenConfig.java similarity index 87% rename from src/main/java/com/youlai/system/model/entity/GenConfig.java rename to src/main/java/com/youlai/boot/platform/generator/model/entity/GenConfig.java index 97d9e6ef..474ae2c8 100644 --- a/src/main/java/com/youlai/system/model/entity/GenConfig.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/entity/GenConfig.java @@ -1,8 +1,8 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.platform.generator.model.entity; import com.baomidou.mybatisplus.annotation.*; -import com.youlai.system.common.base.BaseEntity; +import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/boot/platform/generator/model/entity/GenFieldConfig.java similarity index 86% rename from src/main/java/com/youlai/system/model/entity/GenFieldConfig.java rename to src/main/java/com/youlai/boot/platform/generator/model/entity/GenFieldConfig.java index 0609ecb0..f00eae32 100644 --- a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/entity/GenFieldConfig.java @@ -1,13 +1,12 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.platform.generator.model.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.youlai.system.common.base.BaseEntity; -import com.youlai.system.enums.FormTypeEnum; -import com.youlai.system.enums.QueryTypeEnum; +import com.youlai.boot.common.base.BaseEntity; +import com.youlai.boot.common.enums.FormTypeEnum; +import com.youlai.boot.common.enums.QueryTypeEnum; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/system/model/form/GenConfigForm.java b/src/main/java/com/youlai/boot/platform/generator/model/form/GenConfigForm.java similarity index 94% rename from src/main/java/com/youlai/system/model/form/GenConfigForm.java rename to src/main/java/com/youlai/boot/platform/generator/model/form/GenConfigForm.java index 18b56560..df54e163 100644 --- a/src/main/java/com/youlai/system/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/form/GenConfigForm.java @@ -1,7 +1,7 @@ -package com.youlai.system.model.form; +package com.youlai.boot.platform.generator.model.form; -import com.youlai.system.enums.FormTypeEnum; -import com.youlai.system.enums.QueryTypeEnum; +import com.youlai.boot.common.enums.FormTypeEnum; +import com.youlai.boot.common.enums.QueryTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/service/GenConfigService.java b/src/main/java/com/youlai/boot/platform/generator/service/GenConfigService.java similarity index 63% rename from src/main/java/com/youlai/system/service/GenConfigService.java rename to src/main/java/com/youlai/boot/platform/generator/service/GenConfigService.java index 76156819..6f9975fe 100644 --- a/src/main/java/com/youlai/system/service/GenConfigService.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/GenConfigService.java @@ -1,7 +1,7 @@ -package com.youlai.system.service; +package com.youlai.boot.platform.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.GenConfig; +import com.youlai.boot.platform.generator.model.entity.GenConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/system/service/GenFieldConfigService.java b/src/main/java/com/youlai/boot/platform/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/platform/generator/service/GenFieldConfigService.java index c5007cb2..218c8559 100644 --- a/src/main/java/com/youlai/system/service/GenFieldConfigService.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/GenFieldConfigService.java @@ -1,8 +1,7 @@ -package com.youlai.system.service; +package com.youlai.boot.platform.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.platform.generator.model.entity.GenFieldConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/system/service/GeneratorService.java b/src/main/java/com/youlai/boot/platform/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/platform/generator/service/GeneratorService.java index 4fcb62e3..b02d631c 100644 --- a/src/main/java/com/youlai/system/service/GeneratorService.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/GeneratorService.java @@ -1,10 +1,10 @@ -package com.youlai.system.service; +package com.youlai.boot.platform.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.platform.generator.model.form.GenConfigForm; +import com.youlai.boot.system.model.query.TablePageQuery; +import com.youlai.boot.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.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/platform/generator/service/impl/GenConfigServiceImpl.java similarity index 59% rename from src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java rename to src/main/java/com/youlai/boot/platform/generator/service/impl/GenConfigServiceImpl.java index 746cd496..361b7b76 100644 --- a/src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/impl/GenConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.platform.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.system.service.GenConfigService; +import com.youlai.boot.platform.generator.mapper.GenConfigMapper; +import com.youlai.boot.platform.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.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/platform/generator/service/impl/GenFieldConfigServiceImpl.java similarity index 60% rename from src/main/java/com/youlai/system/service/impl/GenFieldConfigServiceImpl.java rename to src/main/java/com/youlai/boot/platform/generator/service/impl/GenFieldConfigServiceImpl.java index 76b7c27d..28ddb7f6 100644 --- a/src/main/java/com/youlai/system/service/impl/GenFieldConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/impl/GenFieldConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.platform.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.system.service.GenFieldConfigService; +import com.youlai.boot.platform.generator.mapper.GenFieldConfigMapper; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.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/platform/generator/service/impl/GeneratorServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java rename to src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java index 1990707b..e96b6ee7 100644 --- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.platform.generator.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; @@ -11,26 +11,26 @@ import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.SystemApplication; -import com.youlai.system.config.property.GeneratorProperties; -import com.youlai.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.system.service.GeneratorService; -import com.youlai.system.service.GenConfigService; -import com.youlai.system.service.GenFieldConfigService; -import com.youlai.system.service.SysMenuService; +import com.youlai.boot.YouLaiApplication; +import com.youlai.boot.common.enums.FormTypeEnum; +import com.youlai.boot.common.enums.JavaTypeEnum; +import com.youlai.boot.common.enums.QueryTypeEnum; +import com.youlai.boot.config.property.GeneratorProperties; +import com.youlai.boot.platform.generator.service.GenConfigService; +import com.youlai.boot.platform.generator.service.GenFieldConfigService; +import com.youlai.boot.platform.generator.service.GeneratorService; +import com.youlai.boot.system.converter.GenConfigConverter; +import com.youlai.boot.common.exception.BusinessException; +import com.youlai.boot.platform.generator.mapper.DatabaseMapper; +import com.youlai.boot.system.model.bo.ColumnMetaData; +import com.youlai.boot.system.model.bo.TableMetaData; +import com.youlai.boot.platform.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.model.form.GenConfigForm; +import com.youlai.boot.system.model.query.TablePageQuery; +import com.youlai.boot.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.system.model.vo.TablePageVO; +import com.youlai.boot.system.service.MenuService; import lombok.RequiredArgsConstructor; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Value; @@ -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; @@ -59,7 +58,7 @@ public class GeneratorServiceImpl implements GeneratorService { private final GenConfigService genConfigService; private final GenFieldConfigService genFieldConfigService; private final GenConfigConverter genConfigConverter; - private final SysMenuService menuService; + private final MenuService menuService; @Value("${spring.profiles.active}") private String springProfilesActive; @@ -113,7 +112,7 @@ public class GeneratorServiceImpl implements GeneratorService { String entityName = StrUtil.toCamelCase(StrUtil.removePrefix(tableName, tableName.split("_")[0])); genConfig.setEntityName(entityName); - String packageName = SystemApplication.class.getPackageName(); + String packageName = YouLaiApplication.class.getPackageName(); genConfig.setPackageName(StrUtil.subBefore(packageName, ".", true)); genConfig.setModuleName(StrUtil.subAfter(packageName, ".", true)); diff --git a/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java b/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java new file mode 100644 index 00000000..04a1a3ed --- /dev/null +++ b/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java @@ -0,0 +1,14 @@ +package com.youlai.boot.platform.mail.controller; + +import org.springframework.web.bind.annotation.*; + +/** + * 邮件控制层 + * + * @author Ray + * @since 2.10.0 + */ +@RestController +public class MailController { + +} diff --git a/src/main/java/com/youlai/system/service/MailService.java b/src/main/java/com/youlai/boot/platform/mail/service/MailService.java similarity index 70% rename from src/main/java/com/youlai/system/service/MailService.java rename to src/main/java/com/youlai/boot/platform/mail/service/MailService.java index cf629a1d..f1304cfd 100644 --- a/src/main/java/com/youlai/system/service/MailService.java +++ b/src/main/java/com/youlai/boot/platform/mail/service/MailService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service; +package com.youlai.boot.platform.mail.service; /** * 邮件服务接口层 @@ -16,7 +16,7 @@ public interface MailService { * @param subject 邮件主题 * @param text 邮件内容 */ - boolean sendSimpleMail(String to, String subject, String text) ; + void sendMail(String to, String subject, String text) ; /** * 发送带附件的邮件 @@ -26,6 +26,6 @@ public interface MailService { * @param text 邮件内容 * @param filePath 附件路径 */ - boolean sendMailWithAttachment(String to, String subject, String text, String filePath); + void sendMailWithAttachment(String to, String subject, String text, String filePath); } diff --git a/src/main/java/com/youlai/system/service/impl/mail/MailServiceImpl.java b/src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java similarity index 81% rename from src/main/java/com/youlai/system/service/impl/mail/MailServiceImpl.java rename to src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java index a5a55e38..9ffc74b7 100644 --- a/src/main/java/com/youlai/system/service/impl/mail/MailServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java @@ -1,7 +1,7 @@ -package com.youlai.system.service.impl.mail; +package com.youlai.boot.platform.mail.service.impl; -import com.youlai.system.config.property.MailProperties; -import com.youlai.system.service.MailService; +import com.youlai.boot.config.property.MailProperties; +import com.youlai.boot.platform.mail.service.MailService; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import lombok.RequiredArgsConstructor; @@ -37,7 +37,7 @@ public class MailServiceImpl implements MailService { * @param text 邮件内容 */ @Override - public boolean sendSimpleMail(String to, String subject, String text) { + public void sendMail(String to, String subject, String text) { try { SimpleMailMessage message = new SimpleMailMessage(); message.setFrom(mailProperties.getFrom()); @@ -45,11 +45,8 @@ public class MailServiceImpl implements MailService { message.setSubject(subject); message.setText(text); mailSender.send(message); - return true; } catch (Exception e) { - e.printStackTrace(); log.error("发送邮件失败{}", e.getMessage()); - return false; } } @@ -62,7 +59,7 @@ public class MailServiceImpl implements MailService { * @param filePath 附件路径 */ @Override - public boolean sendMailWithAttachment(String to, String subject, String text, String filePath) { + public void sendMailWithAttachment(String to, String subject, String text, String filePath) { MimeMessage message = mailSender.createMimeMessage(); try { MimeMessageHelper helper = new MimeMessageHelper(message, true); @@ -75,9 +72,8 @@ public class MailServiceImpl implements MailService { helper.addAttachment(file.getFilename(), file); mailSender.send(message); - return true; } catch (MessagingException e) { - return false; + log.error("发送邮件失败{}", e.getMessage()); } } } diff --git a/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java b/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java new file mode 100644 index 00000000..7d85c6c0 --- /dev/null +++ b/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java @@ -0,0 +1,22 @@ +package com.youlai.boot.platform.sms.controller; + +import com.youlai.boot.platform.sms.service.SmsService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * 短信控制层 + * + * @author Ray + * @since 2.10.0 + */ +public class SmsController { + + + +} diff --git a/src/main/java/com/youlai/system/service/SmsService.java b/src/main/java/com/youlai/boot/platform/sms/service/SmsService.java similarity index 91% rename from src/main/java/com/youlai/system/service/SmsService.java rename to src/main/java/com/youlai/boot/platform/sms/service/SmsService.java index 9a327eed..eb0309d7 100644 --- a/src/main/java/com/youlai/system/service/SmsService.java +++ b/src/main/java/com/youlai/boot/platform/sms/service/SmsService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service; +package com.youlai.boot.platform.sms.service; /** * 短信服务接口层 diff --git a/src/main/java/com/youlai/system/service/impl/sms/AliyunSmsService.java b/src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java similarity index 93% rename from src/main/java/com/youlai/system/service/impl/sms/AliyunSmsService.java rename to src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java index 2cd6533f..328fa717 100644 --- a/src/main/java/com/youlai/system/service/impl/sms/AliyunSmsService.java +++ b/src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl.sms; +package com.youlai.boot.platform.sms.service.impl; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -8,8 +8,8 @@ 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.system.service.SmsService; +import com.youlai.boot.config.property.AliyunSmsProperties; +import com.youlai.boot.platform.sms.service.SmsService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/controller/WebsocketController.java b/src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java similarity index 94% rename from src/main/java/com/youlai/system/controller/WebsocketController.java rename to src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java index 3d871715..50caff79 100644 --- a/src/main/java/com/youlai/system/controller/WebsocketController.java +++ b/src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java @@ -1,6 +1,6 @@ -package com.youlai.system.controller; +package com.youlai.boot.platform.websocket.controller; -import com.youlai.system.model.dto.ChatMessage; +import com.youlai.boot.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/service/WebsocketService.java b/src/main/java/com/youlai/boot/platform/websocket/service/WebsocketService.java similarity index 84% rename from src/main/java/com/youlai/system/service/WebsocketService.java rename to src/main/java/com/youlai/boot/platform/websocket/service/WebsocketService.java index d3657a29..4e23d583 100644 --- a/src/main/java/com/youlai/system/service/WebsocketService.java +++ b/src/main/java/com/youlai/boot/platform/websocket/service/WebsocketService.java @@ -1,4 +1,4 @@ -package com.youlai.system.service; +package com.youlai.boot.platform.websocket.service; import java.util.Set; diff --git a/src/main/java/com/youlai/system/service/impl/WebsocketServiceImpl.java b/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebsocketServiceImpl.java similarity index 98% rename from src/main/java/com/youlai/system/service/impl/WebsocketServiceImpl.java rename to src/main/java/com/youlai/boot/platform/websocket/service/impl/WebsocketServiceImpl.java index e5799aea..84348481 100644 --- a/src/main/java/com/youlai/system/service/impl/WebsocketServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebsocketServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.platform.websocket.service.impl; import com.youlai.system.event.UserConnectionEvent; import com.youlai.system.model.dto.ChatMessage; diff --git a/src/main/java/com/youlai/system/controller/SysConfigController.java b/src/main/java/com/youlai/boot/system/controller/ConfigController.java similarity index 71% rename from src/main/java/com/youlai/system/controller/SysConfigController.java rename to src/main/java/com/youlai/boot/system/controller/ConfigController.java index dfe88769..f1a2643a 100644 --- a/src/main/java/com/youlai/system/controller/SysConfigController.java +++ b/src/main/java/com/youlai/boot/system/controller/ConfigController.java @@ -1,12 +1,12 @@ -package com.youlai.system.controller; +package com.youlai.boot.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.system.model.form.ConfigForm; +import com.youlai.boot.system.model.query.ConfigPageQuery; +import com.youlai.boot.system.model.vo.ConfigVO; +import com.youlai.boot.system.service.ConfigService; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -29,15 +29,15 @@ import org.springframework.security.access.prepost.PreAuthorize; @RequiredArgsConstructor @Tag(name = "10.系统配置") @RequestMapping("/api/v1/config") -public class SysConfigController { +public class ConfigController { - private final SysConfigService sysConfigService; + private final ConfigService configService; @GetMapping("/page") @Operation(summary = "系统配置分页列表") @PreAuthorize("@ss.hasPerm('sys:config:query')") public PageResult page(@ParameterObject ConfigPageQuery configPageQuery) { - IPage result = sysConfigService.page(configPageQuery); + IPage result = configService.page(configPageQuery); return PageResult.success(result); } @@ -45,7 +45,7 @@ public class SysConfigController { @PostMapping @PreAuthorize("@ss.hasPerm('sys:config:add')") public Result save(@RequestBody @Valid ConfigForm configForm) { - return Result.judge(sysConfigService.save(configForm)); + return Result.judge(configService.save(configForm)); } @Operation(summary = "获取系统配置表单数据") @@ -53,7 +53,7 @@ public class SysConfigController { public Result getConfigForm( @Parameter(description = "系统配置ID") @PathVariable Long id ) { - ConfigForm formData = sysConfigService.getConfigFormData(id); + ConfigForm formData = configService.getConfigFormData(id); return Result.success(formData); } @@ -61,21 +61,21 @@ public class SysConfigController { @PatchMapping @PreAuthorize("@ss.hasPerm('sys:config:refresh')") public Result refreshCache() { - return Result.judge(sysConfigService.refreshCache()); + return Result.judge(configService.refreshCache()); } @PutMapping(value = "/{id}") @Operation(summary = "修改系统配置") @PreAuthorize("@ss.hasPerm('sys:config:update')") public Result update(@Valid @PathVariable Long id, @RequestBody ConfigForm configForm) { - return Result.judge(sysConfigService.edit(id, configForm)); + return Result.judge(configService.edit(id, configForm)); } @DeleteMapping("/{id}") @Operation(summary = "删除系统配置") @PreAuthorize("@ss.hasPerm('sys:config:delete')") public Result delete(@PathVariable Long id) { - return Result.judge(sysConfigService.delete(id)); + return Result.judge(configService.delete(id)); } } diff --git a/src/main/java/com/youlai/system/controller/SysDeptController.java b/src/main/java/com/youlai/boot/system/controller/DeptController.java similarity index 77% rename from src/main/java/com/youlai/system/controller/SysDeptController.java rename to src/main/java/com/youlai/boot/system/controller/DeptController.java index 6aa9d5a8..68b62ecf 100644 --- a/src/main/java/com/youlai/system/controller/SysDeptController.java +++ b/src/main/java/com/youlai/boot/system/controller/DeptController.java @@ -1,14 +1,14 @@ -package com.youlai.system.controller; +package com.youlai.boot.system.controller; -import com.youlai.system.enums.LogModuleEnum; -import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit; -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.system.service.SysDeptService; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.common.annotation.RepeatSubmit; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.system.model.form.DeptForm; +import com.youlai.boot.system.model.query.DeptQuery; +import com.youlai.boot.system.model.vo.DeptVO; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.system.service.DeptService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -29,13 +29,13 @@ import java.util.List; @RestController @RequestMapping("/api/v1/dept") @RequiredArgsConstructor -public class SysDeptController { +public class DeptController { - private final SysDeptService deptService; + private final DeptService deptService; @Operation(summary = "部门列表") @GetMapping - @LogAnnotation( value = "部门列表",module = LogModuleEnum.DEPT) + @Log( value = "部门列表",module = LogModuleEnum.DEPT) public Result> getDeptList( DeptQuery queryParams ) { @@ -53,7 +53,7 @@ public class SysDeptController { @Operation(summary = "新增部门") @PostMapping @PreAuthorize("@ss.hasPerm('sys:dept:add')") - @PreventRepeatSubmit + @RepeatSubmit 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/system/controller/DictController.java similarity index 78% rename from src/main/java/com/youlai/system/controller/SysDictController.java rename to src/main/java/com/youlai/boot/system/controller/DictController.java index 0023f049..1d79d993 100644 --- a/src/main/java/com/youlai/system/controller/SysDictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -1,16 +1,16 @@ -package com.youlai.system.controller; +package com.youlai.boot.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.system.service.SysDictService; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.system.model.query.DictPageQuery; +import com.youlai.boot.system.model.vo.DictPageVO; +import com.youlai.boot.common.annotation.RepeatSubmit; +import com.youlai.boot.system.model.form.DictForm; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.system.service.DictService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -30,13 +30,13 @@ import java.util.List; @RestController @RequestMapping("/api/v1/dict") @RequiredArgsConstructor -public class SysDictController { +public class DictController { - private final SysDictService dictService; + private final DictService dictService; @Operation(summary = "字典分页列表") @GetMapping("/page") - @LogAnnotation( value = "字典分页列表",module = LogModuleEnum.DICT) + @Log( value = "字典分页列表",module = LogModuleEnum.DICT) public PageResult getDictPage( DictPageQuery queryParams ) { @@ -72,7 +72,7 @@ public class SysDictController { @Operation(summary = "新增字典") @PostMapping @PreAuthorize("@ss.hasPerm('sys:dict:add')") - @PreventRepeatSubmit + @RepeatSubmit 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/system/controller/LogController.java similarity index 77% rename from src/main/java/com/youlai/system/controller/SysLogController.java rename to src/main/java/com/youlai/boot/system/controller/LogController.java index fede963b..f829a981 100644 --- a/src/main/java/com/youlai/system/controller/SysLogController.java +++ b/src/main/java/com/youlai/boot/system/controller/LogController.java @@ -1,13 +1,13 @@ -package com.youlai.system.controller; +package com.youlai.boot.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.system.service.SysLogService; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.system.model.query.LogPageQuery; +import com.youlai.boot.system.model.vo.LogPageVO; +import com.youlai.boot.system.model.vo.VisitStatsVO; +import com.youlai.boot.system.model.vo.VisitTrendVO; +import com.youlai.boot.system.service.LogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,9 +28,9 @@ import java.util.List; @RestController @RequestMapping("/api/v1/logs") @RequiredArgsConstructor -public class SysLogController { +public class LogController { - private final SysLogService logService; + private final LogService logService; @Operation(summary = "日志分页列表") @GetMapping("/page") diff --git a/src/main/java/com/youlai/system/controller/SysMenuController.java b/src/main/java/com/youlai/boot/system/controller/MenuController.java similarity index 80% rename from src/main/java/com/youlai/system/controller/SysMenuController.java rename to src/main/java/com/youlai/boot/system/controller/MenuController.java index fb558cca..22537cb7 100644 --- a/src/main/java/com/youlai/system/controller/SysMenuController.java +++ b/src/main/java/com/youlai/boot/system/controller/MenuController.java @@ -1,16 +1,16 @@ -package com.youlai.system.controller; +package com.youlai.boot.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.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.system.service.SysMenuService; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.common.annotation.RepeatSubmit; +import com.youlai.boot.system.model.form.MenuForm; +import com.youlai.boot.system.model.query.MenuQuery; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.vo.RouteVO; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.system.service.MenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -33,13 +33,13 @@ import java.util.Set; @RequestMapping("/api/v1/menus") @RequiredArgsConstructor @Slf4j -public class SysMenuController { +public class MenuController { - private final SysMenuService menuService; + private final MenuService menuService; @Operation(summary = "菜单列表") @GetMapping - @LogAnnotation( value = "菜单列表",module = LogModuleEnum.MENU) + @Log( value = "菜单列表",module = LogModuleEnum.MENU) public Result> listMenus(MenuQuery queryParams) { List menuList = menuService.listMenus(queryParams); return Result.success(menuList); @@ -75,7 +75,7 @@ public class SysMenuController { @Operation(summary = "新增菜单") @PostMapping @PreAuthorize("@ss.hasPerm('sys:menu:add')") - @PreventRepeatSubmit + @RepeatSubmit 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/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java similarity index 100% rename from src/main/java/com/youlai/system/controller/NoticeController.java rename to src/main/java/com/youlai/boot/system/controller/NoticeController.java diff --git a/src/main/java/com/youlai/system/controller/NoticeStatusController.java b/src/main/java/com/youlai/boot/system/controller/NoticeStatusController.java similarity index 100% rename from src/main/java/com/youlai/system/controller/NoticeStatusController.java rename to src/main/java/com/youlai/boot/system/controller/NoticeStatusController.java diff --git a/src/main/java/com/youlai/system/controller/SysRoleController.java b/src/main/java/com/youlai/boot/system/controller/RoleController.java similarity index 82% rename from src/main/java/com/youlai/system/controller/SysRoleController.java rename to src/main/java/com/youlai/boot/system/controller/RoleController.java index 61e8590b..54cdcf33 100644 --- a/src/main/java/com/youlai/system/controller/SysRoleController.java +++ b/src/main/java/com/youlai/boot/system/controller/RoleController.java @@ -1,16 +1,16 @@ -package com.youlai.system.controller; +package com.youlai.boot.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.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.system.service.SysRoleService; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.common.annotation.RepeatSubmit; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.system.model.form.RoleForm; +import com.youlai.boot.system.model.query.RolePageQuery; +import com.youlai.boot.system.model.vo.RolePageVO; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.system.service.RoleService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -33,13 +33,13 @@ import java.util.List; @RestController @RequestMapping("/api/v1/roles") @RequiredArgsConstructor -public class SysRoleController { +public class RoleController { - private final SysRoleService roleService; + private final RoleService roleService; @Operation(summary = "角色分页列表") @GetMapping("/page") - @LogAnnotation( value = "角色分页列表",module = LogModuleEnum.ROLE) + @Log( value = "角色分页列表",module = LogModuleEnum.ROLE) public PageResult getRolePage( RolePageQuery queryParams ) { @@ -57,7 +57,7 @@ public class SysRoleController { @Operation(summary = "新增角色") @PostMapping @PreAuthorize("@ss.hasPerm('sys:role:add')") - @PreventRepeatSubmit + @RepeatSubmit 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/system/controller/UserController.java similarity index 86% rename from src/main/java/com/youlai/system/controller/SysUserController.java rename to src/main/java/com/youlai/boot/system/controller/UserController.java index 02b47440..90586df2 100644 --- a/src/main/java/com/youlai/system/controller/SysUserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -1,27 +1,27 @@ -package com.youlai.system.controller; +package com.youlai.boot.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.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.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.system.service.SysUserService; +import com.youlai.boot.system.model.entity.User; +import com.youlai.boot.system.model.form.*; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.common.enums.ContactType; +import com.youlai.boot.system.model.vo.UserProfileVO; +import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.common.util.ExcelUtils; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.system.model.dto.UserImportDTO; +import com.youlai.boot.common.annotation.RepeatSubmit; +import com.youlai.boot.system.listener.UserImportListener; +import com.youlai.boot.system.model.query.UserPageQuery; +import com.youlai.boot.system.model.dto.UserExportDTO; +import com.youlai.boot.system.model.vo.UserInfoVO; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.system.service.UserService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -52,13 +52,13 @@ import java.util.List; @RestController @RequestMapping("/api/v1/users") @RequiredArgsConstructor -public class SysUserController { +public class UserController { - private final SysUserService userService; + private final UserService userService; @Operation(summary = "用户分页列表") @GetMapping("/page") - @LogAnnotation(value = "用户分页列表", module = LogModuleEnum.USER) + @Log(value = "用户分页列表", module = LogModuleEnum.USER) public PageResult listPagedUsers( UserPageQuery queryParams ) { @@ -69,7 +69,7 @@ public class SysUserController { @Operation(summary = "新增用户") @PostMapping @PreAuthorize("@ss.hasPerm('sys:user:add')") - @PreventRepeatSubmit + @RepeatSubmit public Result saveUser( @RequestBody @Valid UserForm userForm ) { @@ -112,9 +112,9 @@ public class SysUserController { @Parameter(description = "用户ID") @PathVariable Long userId, @Parameter(description = "用户状态(1:启用;0:禁用)") @RequestParam Integer status ) { - boolean result = userService.update(new LambdaUpdateWrapper() - .eq(SysUser::getId, userId) - .set(SysUser::getStatus, status) + boolean result = userService.update(new LambdaUpdateWrapper() + .eq(User::getId, userId) + .set(User::getStatus, status) ); return Result.judge(result); } diff --git a/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java b/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java new file mode 100644 index 00000000..dc448ecd --- /dev/null +++ b/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java @@ -0,0 +1,23 @@ +package com.youlai.boot.system.converter; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.boot.system.model.entity.Config; +import com.youlai.boot.system.model.vo.ConfigVO; +import com.youlai.boot.system.model.form.ConfigForm; +import org.mapstruct.Mapper; + +/** + * 系统配置对象转换器 + * + * @author Theo + * @since 2024-7-29 11:42:49 + */ +@Mapper(componentModel = "spring") +public interface ConfigConverter { + + Page toPageVo(Page page); + + Config toEntity(ConfigForm configForm); + + ConfigForm toForm(Config entity); +} diff --git a/src/main/java/com/youlai/boot/system/converter/DeptConverter.java b/src/main/java/com/youlai/boot/system/converter/DeptConverter.java new file mode 100644 index 00000000..1ca1510e --- /dev/null +++ b/src/main/java/com/youlai/boot/system/converter/DeptConverter.java @@ -0,0 +1,23 @@ +package com.youlai.boot.system.converter; + +import com.youlai.boot.system.model.entity.Dept; +import com.youlai.boot.system.model.vo.DeptVO; +import com.youlai.boot.system.model.form.DeptForm; +import org.mapstruct.Mapper; + +/** + * 部门对象转换器 + * + * @author haoxr + * @since 2022/7/29 + */ +@Mapper(componentModel = "spring") +public interface DeptConverter { + + DeptForm toForm(Dept entity); + + DeptVO toVo(Dept entity); + + Dept toEntity(DeptForm deptForm); + +} \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/converter/DictConverter.java b/src/main/java/com/youlai/boot/system/converter/DictConverter.java new file mode 100644 index 00000000..b15d23fc --- /dev/null +++ b/src/main/java/com/youlai/boot/system/converter/DictConverter.java @@ -0,0 +1,23 @@ +package com.youlai.boot.system.converter; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.boot.system.model.entity.Dict; +import com.youlai.boot.system.model.vo.DictPageVO; +import com.youlai.boot.system.model.form.DictForm; +import org.mapstruct.Mapper; + +/** + * 字典 对象转换器 + * + * @author Ray Hao + * @since 2022/6/8 + */ +@Mapper(componentModel = "spring") +public interface DictConverter { + + Page toPageVo(Page page); + + DictForm toForm(Dict entity); + + Dict toEntity(DictForm entity); +} diff --git a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java new file mode 100644 index 00000000..ea49d58b --- /dev/null +++ b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java @@ -0,0 +1,39 @@ +package com.youlai.boot.system.converter; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.boot.system.model.entity.DictItem; +import com.youlai.boot.system.model.vo.DictPageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.form.DictForm; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; + +import java.util.List; + +/** + * 字典项 对象转换器 + * + * @author Ray + * @since 2022/6/8 + */ +@Mapper(componentModel = "spring") +public interface DictItemConverter { + + Page toPageVo(Page page); + + DictForm toForm(DictItem entity); + + DictItem toEntity(DictForm.DictItem dictItems); + List toEntity(List dictItems); + + DictForm.DictItem toDictItem(DictItem entity); + List toDictItem(List entities); + + @Mappings({ + @Mapping(target = "value", source = "value"), + @Mapping(target = "label", source = "name") + }) + Option toOption(DictItem dictItem); + List> toOption(List dictItems); +} diff --git a/src/main/java/com/youlai/system/converter/GenConfigConverter.java b/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java similarity index 82% rename from src/main/java/com/youlai/system/converter/GenConfigConverter.java rename to src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java index 72454b14..e09b2cf8 100644 --- a/src/main/java/com/youlai/system/converter/GenConfigConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java @@ -1,8 +1,8 @@ -package com.youlai.system.converter; +package com.youlai.boot.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.platform.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.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/system/converter/MenuConverter.java similarity index 51% rename from src/main/java/com/youlai/system/converter/MenuConverter.java rename to src/main/java/com/youlai/boot/system/converter/MenuConverter.java index c5c987a0..a360ed4e 100644 --- a/src/main/java/com/youlai/system/converter/MenuConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/MenuConverter.java @@ -1,8 +1,8 @@ -package com.youlai.system.converter; +package com.youlai.boot.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.system.model.entity.Menu; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.form.MenuForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -15,12 +15,12 @@ import org.mapstruct.Mapping; @Mapper(componentModel = "spring") public interface MenuConverter { - MenuVO toVo(SysMenu entity); + MenuVO toVo(Menu entity); @Mapping(target = "params", ignore = true) - MenuForm toForm(SysMenu entity); + MenuForm toForm(Menu entity); @Mapping(target = "params", ignore = true) - SysMenu toEntity(MenuForm menuForm); + Menu toEntity(MenuForm menuForm); } \ No newline at end of file diff --git a/src/main/java/com/youlai/system/converter/NoticeConverter.java b/src/main/java/com/youlai/boot/system/converter/NoticeConverter.java similarity index 100% rename from src/main/java/com/youlai/system/converter/NoticeConverter.java rename to src/main/java/com/youlai/boot/system/converter/NoticeConverter.java diff --git a/src/main/java/com/youlai/system/converter/NoticeStatusConverter.java b/src/main/java/com/youlai/boot/system/converter/NoticeStatusConverter.java similarity index 100% rename from src/main/java/com/youlai/system/converter/NoticeStatusConverter.java rename to src/main/java/com/youlai/boot/system/converter/NoticeStatusConverter.java diff --git a/src/main/java/com/youlai/system/converter/RoleConverter.java b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java similarity index 50% rename from src/main/java/com/youlai/system/converter/RoleConverter.java rename to src/main/java/com/youlai/boot/system/converter/RoleConverter.java index 0a86a3a4..2ef57392 100644 --- a/src/main/java/com/youlai/system/converter/RoleConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java @@ -1,10 +1,10 @@ -package com.youlai.system.converter; +package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.system.model.entity.Role; +import com.youlai.boot.system.model.vo.RolePageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.form.RoleForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -20,17 +20,17 @@ import java.util.List; @Mapper(componentModel = "spring") public interface RoleConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); @Mappings({ @Mapping(target = "value", source = "id"), @Mapping(target = "label", source = "name") }) - Option entity2Option(SysRole role); + Option entity2Option(Role role); - List> entities2Options(List roles); + List> entities2Options(List roles); - SysRole toEntity(RoleForm roleForm); + Role toEntity(RoleForm roleForm); - RoleForm toForm(SysRole entity); + RoleForm toForm(Role entity); } \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/converter/UserConverter.java b/src/main/java/com/youlai/boot/system/converter/UserConverter.java new file mode 100644 index 00000000..8ba19974 --- /dev/null +++ b/src/main/java/com/youlai/boot/system/converter/UserConverter.java @@ -0,0 +1,49 @@ +package com.youlai.boot.system.converter; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.boot.system.model.entity.User; +import com.youlai.boot.system.model.vo.UserInfoVO; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.system.model.vo.UserProfileVO; +import com.youlai.boot.system.model.bo.UserBO; +import com.youlai.boot.system.model.form.UserForm; +import com.youlai.boot.system.model.dto.UserImportDTO; +import com.youlai.boot.system.model.form.UserProfileForm; +import org.mapstruct.InheritInverseConfiguration; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; + +/** + * 用户对象转换器 + * + * @author haoxr + * @since 2022/6/8 + */ +@Mapper(componentModel = "spring") +public interface UserConverter { + + @Mappings({ + @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); + + Page toPageVo(Page bo); + + UserForm toForm(User entity); + + @InheritInverseConfiguration(name = "toForm") + User toEntity(UserForm entity); + + @Mappings({ + @Mapping(target = "userId", source = "id") + }) + UserInfoVO toUserInfoVo(User entity); + + User toEntity(UserImportDTO vo); + + + UserProfileVO toProfileVO(UserBO bo); + + User toEntity(UserProfileForm formData); +} diff --git a/src/main/java/com/youlai/system/event/UserConnectionEvent.java b/src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java similarity index 91% rename from src/main/java/com/youlai/system/event/UserConnectionEvent.java rename to src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java index c381a87b..8033a2c8 100644 --- a/src/main/java/com/youlai/system/event/UserConnectionEvent.java +++ b/src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java @@ -1,4 +1,4 @@ -package com.youlai.system.event; +package com.youlai.boot.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/system/handler/XxlJobSampleHandler.java similarity index 89% rename from src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java rename to src/main/java/com/youlai/boot/system/handler/XxlJobSampleHandler.java index 91dfb768..69628788 100644 --- a/src/main/java/com/youlai/system/plugin/xxljob/XxlJobSampleHandler.java +++ b/src/main/java/com/youlai/boot/system/handler/XxlJobSampleHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.xxljob; +package com.youlai.boot.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/system/listener/UserImportListener.java similarity index 69% rename from src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java rename to src/main/java/com/youlai/boot/system/listener/UserImportListener.java index 63036c08..9fb8b011 100644 --- a/src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java +++ b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java @@ -1,4 +1,4 @@ -package com.youlai.system.plugin.easyexcel; +package com.youlai.boot.system.listener; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Validator; @@ -7,20 +7,21 @@ 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.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.system.service.SysDeptService; -import com.youlai.system.service.SysRoleService; -import com.youlai.system.service.SysUserRoleService; -import com.youlai.system.service.SysUserService; +import com.youlai.boot.common.base.BaseAnalysisEventListener; +import com.youlai.boot.system.model.entity.Dept; +import com.youlai.boot.system.model.entity.Role; +import com.youlai.boot.system.model.entity.User; +import com.youlai.boot.system.model.entity.UserRole; +import com.youlai.boot.common.base.IBaseEnum; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.GenderEnum; +import com.youlai.boot.common.enums.StatusEnum; +import com.youlai.boot.system.converter.UserConverter; +import com.youlai.boot.system.model.dto.UserImportDTO; +import com.youlai.boot.system.service.DeptService; +import com.youlai.boot.system.service.RoleService; +import com.youlai.boot.system.service.UserRoleService; +import com.youlai.boot.system.service.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; @@ -36,7 +37,7 @@ import java.util.stream.Collectors; * @since 2022/4/10 */ @Slf4j -public class UserImportListener extends MyAnalysisEventListener { +public class UserImportListener extends BaseAnalysisEventListener { // 有效条数 @@ -48,19 +49,19 @@ public class UserImportListener extends MyAnalysisEventListener { // 导入返回信息 StringBuilder msg = new StringBuilder(); - private final SysUserService userService; + private final UserService userService; private final PasswordEncoder passwordEncoder; private final UserConverter userConverter; - private final SysRoleService roleService; - private final SysUserRoleService userRoleService; - private final SysDeptService deptService; + private final RoleService roleService; + private final UserRoleService userRoleService; + private final DeptService deptService; public UserImportListener() { - this.userService = SpringUtil.getBean(SysUserService.class); + this.userService = SpringUtil.getBean(UserService.class); this.passwordEncoder = SpringUtil.getBean(PasswordEncoder.class); - this.roleService = SpringUtil.getBean(SysRoleService.class); - this.userRoleService = SpringUtil.getBean(SysUserRoleService.class); - this.deptService = SpringUtil.getBean(SysDeptService.class); + this.roleService = SpringUtil.getBean(RoleService.class); + this.userRoleService = SpringUtil.getBean(UserRoleService.class); + this.deptService = SpringUtil.getBean(DeptService.class); this.userConverter = SpringUtil.getBean(UserConverter.class); } @@ -82,7 +83,7 @@ public class UserImportListener extends MyAnalysisEventListener { if (StrUtil.isBlank(username)) { validationMsg.append("用户名为空；"); } else { - long count = userService.count(new LambdaQueryWrapper().eq(SysUser::getUsername, username)); + long count = userService.count(new LambdaQueryWrapper().eq(User::getUsername, username)); if (count > 0) { validationMsg.append("用户名已存在；"); } @@ -104,7 +105,7 @@ public class UserImportListener extends MyAnalysisEventListener { if (validationMsg.isEmpty()) { // 校验通过，持久化至数据库 - SysUser entity = userConverter.toEntity(userImportDTO); + User entity = userConverter.toEntity(userImportDTO); entity.setPassword(passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD)); // 默认密码 // 性别翻译 String genderLabel = userImportDTO.getGenderLabel(); @@ -118,19 +119,19 @@ public class UserImportListener extends MyAnalysisEventListener { List roleIds = null; if (StrUtil.isNotBlank(roleCodes)) { roleIds = roleService.list( - new LambdaQueryWrapper() - .in(SysRole::getCode, (Object) roleCodes.split(",")) - .eq(SysRole::getStatus, StatusEnum.ENABLE.getValue()) - .select(SysRole::getId) + new LambdaQueryWrapper() + .in(Role::getCode, (Object) roleCodes.split(",")) + .eq(Role::getStatus, StatusEnum.ENABLE.getValue()) + .select(Role::getId) ).stream() - .map(SysRole::getId) + .map(Role::getId) .collect(Collectors.toList()); } // 部门解析 String deptCode = userImportDTO.getDeptCode(); if (StrUtil.isNotBlank(deptCode)) { - SysDept dept = deptService.getOne(new LambdaQueryWrapper().eq(SysDept::getCode, deptCode) - .select(SysDept::getId) + Dept dept = deptService.getOne(new LambdaQueryWrapper().eq(Dept::getCode, deptCode) + .select(Dept::getId) ); if (dept != null) { entity.setDeptId(dept.getId()); @@ -143,8 +144,8 @@ public class UserImportListener extends MyAnalysisEventListener { validCount++; // 保存用户角色关联 if (CollectionUtil.isNotEmpty(roleIds)) { - List userRoles = roleIds.stream() - .map(roleId -> new SysUserRole(entity.getId(), roleId)) + List userRoles = roleIds.stream() + .map(roleId -> new UserRole(entity.getId(), roleId)) .collect(Collectors.toList()); userRoleService.saveBatch(userRoles); } diff --git a/src/main/java/com/youlai/system/mapper/SysConfigMapper.java b/src/main/java/com/youlai/boot/system/mapper/ConfigMapper.java similarity index 56% rename from src/main/java/com/youlai/system/mapper/SysConfigMapper.java rename to src/main/java/com/youlai/boot/system/mapper/ConfigMapper.java index 60bbd289..d63997dc 100644 --- a/src/main/java/com/youlai/system/mapper/SysConfigMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/ConfigMapper.java @@ -1,8 +1,8 @@ -package com.youlai.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.youlai.boot.system.model.entity.Config; import org.apache.ibatis.annotations.Mapper; -import com.youlai.system.model.entity.SysConfig; /** * 系统配置 访问层 @@ -11,6 +11,6 @@ import com.youlai.system.model.entity.SysConfig; * @since 2024-7-29 11:41:04 */ @Mapper -public interface SysConfigMapper extends BaseMapper { +public interface ConfigMapper extends BaseMapper { } diff --git a/src/main/java/com/youlai/system/mapper/SysDeptMapper.java b/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java similarity index 54% rename from src/main/java/com/youlai/system/mapper/SysDeptMapper.java rename to src/main/java/com/youlai/boot/system/mapper/DeptMapper.java index 4cfc1b82..e00f27bf 100644 --- a/src/main/java/com/youlai/system/mapper/SysDeptMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java @@ -1,10 +1,10 @@ -package com.youlai.system.mapper; +package com.youlai.boot.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.system.model.entity.Dept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,9 +12,9 @@ import java.util.List; @Mapper -public interface SysDeptMapper extends BaseMapper { +public interface DeptMapper extends BaseMapper { @DataPermission(deptIdColumnName = "id") @Override - List selectList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectList(@Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/src/main/java/com/youlai/system/mapper/SysDictItemMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java similarity index 54% rename from src/main/java/com/youlai/system/mapper/SysDictItemMapper.java rename to src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java index 387f1fdb..7f6a137c 100644 --- a/src/main/java/com/youlai/system/mapper/SysDictItemMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.SysDictItem; +import com.youlai.boot.system.model.entity.DictItem; import org.apache.ibatis.annotations.Mapper; /** @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; * @since 2.9.0 */ @Mapper -public interface SysDictItemMapper extends BaseMapper { +public interface DictItemMapper extends BaseMapper { } diff --git a/src/main/java/com/youlai/system/mapper/SysDictMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java similarity index 65% rename from src/main/java/com/youlai/system/mapper/SysDictMapper.java rename to src/main/java/com/youlai/boot/system/mapper/DictMapper.java index 2565b95c..6fff142f 100644 --- a/src/main/java/com/youlai/system/mapper/SysDictMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java @@ -1,10 +1,10 @@ -package com.youlai.system.mapper; +package com.youlai.boot.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.system.model.entity.Dict; +import com.youlai.boot.system.model.query.DictPageQuery; +import com.youlai.boot.system.model.vo.DictPageVO; import org.apache.ibatis.annotations.Mapper; /** @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper; * @since 2.9.0 */ @Mapper -public interface SysDictMapper extends BaseMapper { +public interface DictMapper extends BaseMapper { /** * 字典分页列表 diff --git a/src/main/java/com/youlai/system/mapper/SysLogMapper.java b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java similarity index 76% rename from src/main/java/com/youlai/system/mapper/SysLogMapper.java rename to src/main/java/com/youlai/boot/system/mapper/LogMapper.java index d0155dba..a29bc6a8 100644 --- a/src/main/java/com/youlai/system/mapper/SysLogMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java @@ -1,12 +1,12 @@ -package com.youlai.system.mapper; +package com.youlai.boot.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.system.model.bo.VisitCount; +import com.youlai.boot.system.model.entity.Log; +import com.youlai.boot.system.model.query.LogPageQuery; +import com.youlai.boot.system.model.vo.LogPageVO; +import com.youlai.boot.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; @@ -19,7 +19,7 @@ import java.util.List; * @since 2.10.0 */ @Mapper -public interface SysLogMapper extends BaseMapper { +public interface LogMapper extends BaseMapper { /** * 获取日志分页列表 diff --git a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java b/src/main/java/com/youlai/boot/system/mapper/MenuMapper.java similarity index 62% rename from src/main/java/com/youlai/system/mapper/SysMenuMapper.java rename to src/main/java/com/youlai/boot/system/mapper/MenuMapper.java index 3cd3aa41..73ae140f 100644 --- a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/MenuMapper.java @@ -1,8 +1,8 @@ -package com.youlai.system.mapper; +package com.youlai.boot.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.system.model.bo.RouteBO; +import com.youlai.boot.system.model.entity.Menu; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -16,7 +16,7 @@ import java.util.Set; */ @Mapper -public interface SysMenuMapper extends BaseMapper { +public interface MenuMapper extends BaseMapper { /** * 获取菜单路由列表 diff --git a/src/main/java/com/youlai/system/mapper/NoticeMapper.java b/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java similarity index 100% rename from src/main/java/com/youlai/system/mapper/NoticeMapper.java rename to src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java diff --git a/src/main/java/com/youlai/system/mapper/NoticeStatusMapper.java b/src/main/java/com/youlai/boot/system/mapper/NoticeStatusMapper.java similarity index 100% rename from src/main/java/com/youlai/system/mapper/NoticeStatusMapper.java rename to src/main/java/com/youlai/boot/system/mapper/NoticeStatusMapper.java diff --git a/src/main/java/com/youlai/system/mapper/SysRoleMapper.java b/src/main/java/com/youlai/boot/system/mapper/RoleMapper.java similarity index 66% rename from src/main/java/com/youlai/system/mapper/SysRoleMapper.java rename to src/main/java/com/youlai/boot/system/mapper/RoleMapper.java index fba8f94c..b546cc98 100644 --- a/src/main/java/com/youlai/system/mapper/SysRoleMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/RoleMapper.java @@ -1,13 +1,13 @@ -package com.youlai.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.SysRole; +import com.youlai.boot.system.model.entity.Role; import org.apache.ibatis.annotations.Mapper; import java.util.Set; @Mapper -public interface SysRoleMapper extends BaseMapper { +public interface RoleMapper extends BaseMapper { /** diff --git a/src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java b/src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java similarity index 76% rename from src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java rename to src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java index 371e5639..5f68f18e 100644 --- a/src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java @@ -1,8 +1,8 @@ -package com.youlai.system.mapper; +package com.youlai.boot.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.system.model.bo.RolePermsBO; +import com.youlai.boot.system.model.entity.RoleMenu; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,7 +15,7 @@ import java.util.Set; * @since 2022/6/4 */ @Mapper -public interface SysRoleMenuMapper extends BaseMapper { +public interface RoleMenuMapper extends BaseMapper { /** * 获取角色拥有的菜单ID集合 diff --git a/src/main/java/com/youlai/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java similarity index 71% rename from src/main/java/com/youlai/system/mapper/SysUserMapper.java rename to src/main/java/com/youlai/boot/system/mapper/UserMapper.java index e222c3ad..2d6c3fed 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java @@ -1,14 +1,14 @@ -package com.youlai.system.mapper; +package com.youlai.boot.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.system.model.bo.UserBO; +import com.youlai.boot.system.model.entity.User; +import com.youlai.boot.system.model.query.UserPageQuery; +import com.youlai.boot.system.model.form.UserForm; +import com.youlai.boot.common.annotation.DataPermission; +import com.youlai.boot.system.model.dto.UserAuthInfo; +import com.youlai.boot.system.model.dto.UserExportDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -20,7 +20,7 @@ import java.util.List; * @since 2022/1/14 */ @Mapper -public interface SysUserMapper extends BaseMapper { +public interface UserMapper extends BaseMapper { /** * 获取用户分页列表 diff --git a/src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserRoleMapper.java similarity index 67% rename from src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java rename to src/main/java/com/youlai/boot/system/mapper/UserRoleMapper.java index 7b96ec00..196c2a52 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserRoleMapper.java @@ -1,7 +1,7 @@ -package com.youlai.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.model.entity.SysUserRole; +import com.youlai.boot.system.model.entity.UserRole; import org.apache.ibatis.annotations.Mapper; /** @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; * @since 2022/1/15 */ @Mapper -public interface SysUserRoleMapper extends BaseMapper { +public interface UserRoleMapper extends BaseMapper { /** * 获取角色绑定的用户数 diff --git a/src/main/java/com/youlai/system/model/bo/ColumnMetaData.java b/src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java similarity index 95% rename from src/main/java/com/youlai/system/model/bo/ColumnMetaData.java rename to src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java index c3137a2a..b956a4d9 100644 --- a/src/main/java/com/youlai/system/model/bo/ColumnMetaData.java +++ b/src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.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/system/model/bo/RolePermsBO.java similarity index 87% rename from src/main/java/com/youlai/system/model/bo/RolePermsBO.java rename to src/main/java/com/youlai/boot/system/model/bo/RolePermsBO.java index 6e8c764a..198e8180 100644 --- a/src/main/java/com/youlai/system/model/bo/RolePermsBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/RolePermsBO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.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/system/model/bo/RouteBO.java similarity index 93% rename from src/main/java/com/youlai/system/model/bo/RouteBO.java rename to src/main/java/com/youlai/boot/system/model/bo/RouteBO.java index dce35ddb..b546b280 100644 --- a/src/main/java/com/youlai/system/model/bo/RouteBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/RouteBO.java @@ -1,6 +1,6 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.system.model.bo; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.boot.common.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/system/model/bo/TableMetaData.java similarity index 92% rename from src/main/java/com/youlai/system/model/bo/TableMetaData.java rename to src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java index d4b78792..b011df8e 100644 --- a/src/main/java/com/youlai/system/model/bo/TableMetaData.java +++ b/src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.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/system/model/bo/UserBO.java similarity index 96% rename from src/main/java/com/youlai/system/model/bo/UserBO.java rename to src/main/java/com/youlai/boot/system/model/bo/UserBO.java index 34395570..2756db20 100644 --- a/src/main/java/com/youlai/system/model/bo/UserBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/UserBO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.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/system/model/bo/VisitCount.java similarity index 86% rename from src/main/java/com/youlai/system/model/bo/VisitCount.java rename to src/main/java/com/youlai/boot/system/model/bo/VisitCount.java index 3c9a22c0..a5e1b81c 100644 --- a/src/main/java/com/youlai/system/model/bo/VisitCount.java +++ b/src/main/java/com/youlai/boot/system/model/bo/VisitCount.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.bo; +package com.youlai.boot.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/system/model/dto/CaptchaResult.java similarity index 92% rename from src/main/java/com/youlai/system/model/dto/CaptchaResult.java rename to src/main/java/com/youlai/boot/system/model/dto/CaptchaResult.java index 4f7e34dd..522f1f80 100644 --- a/src/main/java/com/youlai/system/model/dto/CaptchaResult.java +++ b/src/main/java/com/youlai/boot/system/model/dto/CaptchaResult.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.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/system/model/dto/ChatMessage.java similarity index 88% rename from src/main/java/com/youlai/system/model/dto/ChatMessage.java rename to src/main/java/com/youlai/boot/system/model/dto/ChatMessage.java index 6dd6de32..7e2a6e79 100644 --- a/src/main/java/com/youlai/system/model/dto/ChatMessage.java +++ b/src/main/java/com/youlai/boot/system/model/dto/ChatMessage.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.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/system/model/dto/FileInfo.java similarity index 86% rename from src/main/java/com/youlai/system/model/dto/FileInfo.java rename to src/main/java/com/youlai/boot/system/model/dto/FileInfo.java index 86be5d94..537ff668 100644 --- a/src/main/java/com/youlai/system/model/dto/FileInfo.java +++ b/src/main/java/com/youlai/boot/system/model/dto/FileInfo.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.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/system/model/dto/LoginResult.java similarity index 92% rename from src/main/java/com/youlai/system/model/dto/LoginResult.java rename to src/main/java/com/youlai/boot/system/model/dto/LoginResult.java index 764749b2..769cbf9b 100644 --- a/src/main/java/com/youlai/system/model/dto/LoginResult.java +++ b/src/main/java/com/youlai/boot/system/model/dto/LoginResult.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.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/system/model/dto/UserAuthInfo.java similarity index 90% rename from src/main/java/com/youlai/system/model/dto/UserAuthInfo.java rename to src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java index 2117ecc1..0f4e0880 100644 --- a/src/main/java/com/youlai/system/model/dto/UserAuthInfo.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.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/system/model/dto/UserExportDTO.java similarity index 95% rename from src/main/java/com/youlai/system/model/dto/UserExportDTO.java rename to src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java index c0bc88eb..fd3c3e87 100644 --- a/src/main/java/com/youlai/system/model/dto/UserExportDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.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/system/model/dto/UserImportDTO.java similarity index 93% rename from src/main/java/com/youlai/system/model/dto/UserImportDTO.java rename to src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java index 40694b2e..3a9bedbf 100644 --- a/src/main/java/com/youlai/system/model/dto/UserImportDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.dto; +package com.youlai.boot.system.model.dto; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/entity/SysConfig.java b/src/main/java/com/youlai/boot/system/model/entity/Config.java similarity index 82% rename from src/main/java/com/youlai/system/model/entity/SysConfig.java rename to src/main/java/com/youlai/boot/system/model/entity/Config.java index a0c52683..a82a515c 100644 --- a/src/main/java/com/youlai/system/model/entity/SysConfig.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Config.java @@ -1,10 +1,8 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.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,10 +11,10 @@ import io.swagger.v3.oas.annotations.media.Schema; * @author Theo * @since 2024-07-29 11:17:26 */ -@Data -@TableName("sys_config") @Schema(description = "系统配置") -public class SysConfig extends BaseEntity { +@TableName("sys_config") +@Data +public class Config extends BaseEntity { @Schema(description = "配置名称") private String configName; diff --git a/src/main/java/com/youlai/system/model/entity/SysDept.java b/src/main/java/com/youlai/boot/system/model/entity/Dept.java similarity index 74% rename from src/main/java/com/youlai/system/model/entity/SysDept.java rename to src/main/java/com/youlai/boot/system/model/entity/Dept.java index f2952e30..9083ffd2 100644 --- a/src/main/java/com/youlai/system/model/entity/SysDept.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Dept.java @@ -1,18 +1,20 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; -import com.youlai.system.common.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; /** - * 部门 实体 + * 部门实体 * * @author Ray * @since 2024/06/23 */ +@TableName("sys_dept") @Getter @Setter -public class SysDept extends BaseEntity { +public class Dept extends BaseEntity { /** * 部门名称 diff --git a/src/main/java/com/youlai/system/model/entity/SysDict.java b/src/main/java/com/youlai/boot/system/model/entity/Dict.java similarity index 63% rename from src/main/java/com/youlai/system/model/entity/SysDict.java rename to src/main/java/com/youlai/boot/system/model/entity/Dict.java index 84380234..586b4fa4 100644 --- a/src/main/java/com/youlai/system/model/entity/SysDict.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Dict.java @@ -1,6 +1,7 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; -import com.youlai.system.common.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import com.youlai.boot.common.base.BaseEntity; import lombok.Data; /** @@ -9,8 +10,9 @@ import lombok.Data; * @author haoxr * @since 2022/12/17 */ +@TableName("sys_dict") @Data -public class SysDict extends BaseEntity { +public class Dict extends BaseEntity { /** * 类型名称 diff --git a/src/main/java/com/youlai/system/model/entity/SysDictItem.java b/src/main/java/com/youlai/boot/system/model/entity/DictItem.java similarity index 80% rename from src/main/java/com/youlai/system/model/entity/SysDictItem.java rename to src/main/java/com/youlai/boot/system/model/entity/DictItem.java index c90a6c22..0750a3c8 100644 --- a/src/main/java/com/youlai/system/model/entity/SysDictItem.java +++ b/src/main/java/com/youlai/boot/system/model/entity/DictItem.java @@ -1,10 +1,11 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** @@ -13,8 +14,9 @@ import lombok.Data; * @author haoxr * @since 2022/12/17 */ +@TableName("sys_dict_item") @Data -public class SysDictItem implements Serializable { +public class DictItem implements Serializable { /** * 主键 */ diff --git a/src/main/java/com/youlai/system/model/entity/SysLog.java b/src/main/java/com/youlai/boot/system/model/entity/Log.java similarity index 87% rename from src/main/java/com/youlai/system/model/entity/SysLog.java rename to src/main/java/com/youlai/boot/system/model/entity/Log.java index 10536bba..db4e8748 100644 --- a/src/main/java/com/youlai/system/model/entity/SysLog.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Log.java @@ -1,11 +1,11 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import java.io.Serializable; import java.time.LocalDateTime; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.enums.LogModuleEnum; import lombok.Data; /** @@ -14,8 +14,9 @@ import lombok.Data; * @author Ray * @since 2.10.0 */ +@TableName("sys_log") @Data -public class SysLog implements Serializable { +public class Log implements Serializable { /** * 主键 */ diff --git a/src/main/java/com/youlai/system/model/entity/SysMenu.java b/src/main/java/com/youlai/boot/system/model/entity/Menu.java similarity index 92% rename from src/main/java/com/youlai/system/model/entity/SysMenu.java rename to src/main/java/com/youlai/boot/system/model/entity/Menu.java index 26a77ccc..cd5a1aae 100644 --- a/src/main/java/com/youlai/system/model/entity/SysMenu.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Menu.java @@ -1,22 +1,23 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.*; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.boot.common.enums.MenuTypeEnum; import lombok.Getter; import lombok.Setter; import java.time.LocalDateTime; /** - * 菜单 实体 + * 菜单实体 * * @author Ray * @since 2023/3/6 */ +@TableName("sys_menu") @Getter @Setter -public class SysMenu { +public class Menu { /** * 菜单ID */ diff --git a/src/main/java/com/youlai/system/model/entity/Notice.java b/src/main/java/com/youlai/boot/system/model/entity/Notice.java similarity index 100% rename from src/main/java/com/youlai/system/model/entity/Notice.java rename to src/main/java/com/youlai/boot/system/model/entity/Notice.java diff --git a/src/main/java/com/youlai/system/model/entity/NoticeStatus.java b/src/main/java/com/youlai/boot/system/model/entity/NoticeStatus.java similarity index 100% rename from src/main/java/com/youlai/system/model/entity/NoticeStatus.java rename to src/main/java/com/youlai/boot/system/model/entity/NoticeStatus.java diff --git a/src/main/java/com/youlai/system/model/entity/SysRole.java b/src/main/java/com/youlai/boot/system/model/entity/Role.java similarity index 72% rename from src/main/java/com/youlai/system/model/entity/SysRole.java rename to src/main/java/com/youlai/boot/system/model/entity/Role.java index 6b4ca6a7..724e5e35 100644 --- a/src/main/java/com/youlai/system/model/entity/SysRole.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Role.java @@ -1,18 +1,20 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; -import com.youlai.system.common.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; /** - * 角色 实体 + * 角色实体 * * @author Ray * @since 2024/6/23 */ +@TableName("sys_role") @Getter @Setter -public class SysRole extends BaseEntity { +public class Role extends BaseEntity { /** * 角色名称 diff --git a/src/main/java/com/youlai/system/model/entity/SysRoleMenu.java b/src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java similarity index 73% rename from src/main/java/com/youlai/system/model/entity/SysRoleMenu.java rename to src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java index 59f2d09b..a81c4c27 100644 --- a/src/main/java/com/youlai/system/model/entity/SysRoleMenu.java +++ b/src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java @@ -1,6 +1,7 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,10 +10,11 @@ import lombok.NoArgsConstructor; /** * 角色和菜单关联表 */ +@TableName("sys_role_menu") @Data @AllArgsConstructor @NoArgsConstructor -public class SysRoleMenu { +public class RoleMenu { /** * 角色ID */ diff --git a/src/main/java/com/youlai/system/model/entity/SysUser.java b/src/main/java/com/youlai/boot/system/model/entity/User.java similarity index 77% rename from src/main/java/com/youlai/system/model/entity/SysUser.java rename to src/main/java/com/youlai/boot/system/model/entity/User.java index 6e79dc64..e617910e 100644 --- a/src/main/java/com/youlai/system/model/entity/SysUser.java +++ b/src/main/java/com/youlai/boot/system/model/entity/User.java @@ -1,15 +1,17 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; -import com.youlai.system.common.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; /** - * 用户 实体 + * 用户实体 */ +@TableName("sys_user") @Getter @Setter -public class SysUser extends BaseEntity { +public class User extends BaseEntity { /** * 用户名 diff --git a/src/main/java/com/youlai/system/model/entity/SysUserRole.java b/src/main/java/com/youlai/boot/system/model/entity/UserRole.java similarity index 75% rename from src/main/java/com/youlai/system/model/entity/SysUserRole.java rename to src/main/java/com/youlai/boot/system/model/entity/UserRole.java index 11a5a539..9db979db 100644 --- a/src/main/java/com/youlai/system/model/entity/SysUserRole.java +++ b/src/main/java/com/youlai/boot/system/model/entity/UserRole.java @@ -1,6 +1,7 @@ -package com.youlai.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,10 +13,11 @@ import lombok.NoArgsConstructor; * @author haoxr * @since 2022/12/17 */ +@TableName("sys_user_role") @Data @AllArgsConstructor @NoArgsConstructor -public class SysUserRole { +public class UserRole { /** * 用户ID */ diff --git a/src/main/java/com/youlai/system/model/form/ConfigForm.java b/src/main/java/com/youlai/boot/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/system/model/form/ConfigForm.java index 2d0fcda4..6e83c039 100644 --- a/src/main/java/com/youlai/system/model/form/ConfigForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/ConfigForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/system/model/form/DeptForm.java similarity index 95% rename from src/main/java/com/youlai/system/model/form/DeptForm.java rename to src/main/java/com/youlai/boot/system/model/form/DeptForm.java index 5a5941dd..66cc3654 100644 --- a/src/main/java/com/youlai/system/model/form/DeptForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/DeptForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/system/model/form/DictForm.java similarity index 97% rename from src/main/java/com/youlai/system/model/form/DictForm.java rename to src/main/java/com/youlai/boot/system/model/form/DictForm.java index 12e61616..a7d614bd 100644 --- a/src/main/java/com/youlai/system/model/form/DictForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/DictForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/system/model/form/EmailChangeForm.java similarity index 89% rename from src/main/java/com/youlai/system/model/form/EmailChangeForm.java rename to src/main/java/com/youlai/boot/system/model/form/EmailChangeForm.java index 8ae16df2..befe5c5b 100644 --- a/src/main/java/com/youlai/system/model/form/EmailChangeForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/EmailChangeForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/MenuForm.java b/src/main/java/com/youlai/boot/system/model/form/MenuForm.java similarity index 92% rename from src/main/java/com/youlai/system/model/form/MenuForm.java rename to src/main/java/com/youlai/boot/system/model/form/MenuForm.java index 4856e409..98550a7c 100644 --- a/src/main/java/com/youlai/system/model/form/MenuForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/MenuForm.java @@ -1,7 +1,7 @@ -package com.youlai.system.model.form; +package com.youlai.boot.system.model.form; -import com.youlai.system.enums.MenuTypeEnum; -import com.youlai.system.common.model.KeyValue; +import com.youlai.boot.common.enums.MenuTypeEnum; +import com.youlai.boot.common.model.KeyValue; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/src/main/java/com/youlai/system/model/form/MobileBindingForm.java b/src/main/java/com/youlai/boot/system/model/form/MobileBindingForm.java similarity index 89% rename from src/main/java/com/youlai/system/model/form/MobileBindingForm.java rename to src/main/java/com/youlai/boot/system/model/form/MobileBindingForm.java index 9a678316..9dd7cbf2 100644 --- a/src/main/java/com/youlai/system/model/form/MobileBindingForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/MobileBindingForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/NoticeForm.java b/src/main/java/com/youlai/boot/system/model/form/NoticeForm.java similarity index 100% rename from src/main/java/com/youlai/system/model/form/NoticeForm.java rename to src/main/java/com/youlai/boot/system/model/form/NoticeForm.java diff --git a/src/main/java/com/youlai/system/model/form/NoticeStatusForm.java b/src/main/java/com/youlai/boot/system/model/form/NoticeStatusForm.java similarity index 100% rename from src/main/java/com/youlai/system/model/form/NoticeStatusForm.java rename to src/main/java/com/youlai/boot/system/model/form/NoticeStatusForm.java diff --git a/src/main/java/com/youlai/system/model/form/PasswordChangeForm.java b/src/main/java/com/youlai/boot/system/model/form/PasswordChangeForm.java similarity index 89% rename from src/main/java/com/youlai/system/model/form/PasswordChangeForm.java rename to src/main/java/com/youlai/boot/system/model/form/PasswordChangeForm.java index a48f17f4..f282c6bf 100644 --- a/src/main/java/com/youlai/system/model/form/PasswordChangeForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/PasswordChangeForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/system/model/form/PasswordResetForm.java similarity index 89% rename from src/main/java/com/youlai/system/model/form/PasswordResetForm.java rename to src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java index f61f49ec..a1acca63 100644 --- a/src/main/java/com/youlai/system/model/form/PasswordResetForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/system/model/form/RoleForm.java similarity index 95% rename from src/main/java/com/youlai/system/model/form/RoleForm.java rename to src/main/java/com/youlai/boot/system/model/form/RoleForm.java index 884c0c89..d1588557 100644 --- a/src/main/java/com/youlai/system/model/form/RoleForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/RoleForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/system/model/form/UserForm.java similarity index 97% rename from src/main/java/com/youlai/system/model/form/UserForm.java rename to src/main/java/com/youlai/boot/system/model/form/UserForm.java index 6d8dda91..8b48259a 100644 --- a/src/main/java/com/youlai/system/model/form/UserForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/UserForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/system/model/form/UserProfileForm.java similarity index 94% rename from src/main/java/com/youlai/system/model/form/UserProfileForm.java rename to src/main/java/com/youlai/boot/system/model/form/UserProfileForm.java index 2f23fdc4..4bd35db5 100644 --- a/src/main/java/com/youlai/system/model/form/UserProfileForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/UserProfileForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.form; +package com.youlai.boot.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/system/model/query/ConfigPageQuery.java similarity index 80% rename from src/main/java/com/youlai/system/model/query/ConfigPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/ConfigPageQuery.java index 13398e25..3105c2a9 100644 --- a/src/main/java/com/youlai/system/model/query/ConfigPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/ConfigPageQuery.java @@ -1,6 +1,6 @@ -package com.youlai.system.model.query; +package com.youlai.boot.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/system/model/query/DeptQuery.java similarity index 89% rename from src/main/java/com/youlai/system/model/query/DeptQuery.java rename to src/main/java/com/youlai/boot/system/model/query/DeptQuery.java index b12215c3..3a7afadb 100644 --- a/src/main/java/com/youlai/system/model/query/DeptQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/DeptQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.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/system/model/query/DictPageQuery.java similarity index 78% rename from src/main/java/com/youlai/system/model/query/DictPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java index 79fb322c..282e7947 100644 --- a/src/main/java/com/youlai/system/model/query/DictPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java @@ -1,7 +1,7 @@ -package com.youlai.system.model.query; +package com.youlai.boot.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.Data; diff --git a/src/main/java/com/youlai/system/model/query/LogPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java similarity index 84% rename from src/main/java/com/youlai/system/model/query/LogPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java index e5bc11e3..1de60a20 100644 --- a/src/main/java/com/youlai/system/model/query/LogPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java @@ -1,6 +1,6 @@ -package com.youlai.system.model.query; +package com.youlai.boot.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/MenuQuery.java b/src/main/java/com/youlai/boot/system/model/query/MenuQuery.java similarity index 89% rename from src/main/java/com/youlai/system/model/query/MenuQuery.java rename to src/main/java/com/youlai/boot/system/model/query/MenuQuery.java index 7967931e..e9de9971 100644 --- a/src/main/java/com/youlai/system/model/query/MenuQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/MenuQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.query; +package com.youlai.boot.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/NoticeQuery.java b/src/main/java/com/youlai/boot/system/model/query/NoticeQuery.java similarity index 100% rename from src/main/java/com/youlai/system/model/query/NoticeQuery.java rename to src/main/java/com/youlai/boot/system/model/query/NoticeQuery.java diff --git a/src/main/java/com/youlai/system/model/query/NoticeStatusQuery.java b/src/main/java/com/youlai/boot/system/model/query/NoticeStatusQuery.java similarity index 100% rename from src/main/java/com/youlai/system/model/query/NoticeStatusQuery.java rename to src/main/java/com/youlai/boot/system/model/query/NoticeStatusQuery.java diff --git a/src/main/java/com/youlai/system/model/query/PermPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/PermPageQuery.java similarity index 78% rename from src/main/java/com/youlai/system/model/query/PermPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/PermPageQuery.java index a497f0ce..95cb5485 100644 --- a/src/main/java/com/youlai/system/model/query/PermPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/PermPageQuery.java @@ -1,6 +1,6 @@ -package com.youlai.system.model.query; +package com.youlai.boot.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.Data; diff --git a/src/main/java/com/youlai/system/model/query/RolePageQuery.java b/src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java similarity index 88% rename from src/main/java/com/youlai/system/model/query/RolePageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java index 02c0eb93..4fc7cd3d 100644 --- a/src/main/java/com/youlai/system/model/query/RolePageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java @@ -1,7 +1,7 @@ -package com.youlai.system.model.query; +package com.youlai.boot.system.model.query; import com.fasterxml.jackson.annotation.JsonFormat; -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/TablePageQuery.java b/src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java similarity index 85% rename from src/main/java/com/youlai/system/model/query/TablePageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java index 3844a804..c841f9f2 100644 --- a/src/main/java/com/youlai/system/model/query/TablePageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java @@ -1,7 +1,7 @@ -package com.youlai.system.model.query; +package com.youlai.boot.system.model.query; import com.fasterxml.jackson.annotation.JsonIgnore; -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/UserPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java similarity index 86% rename from src/main/java/com/youlai/system/model/query/UserPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java index 025ff868..5d7f7157 100644 --- a/src/main/java/com/youlai/system/model/query/UserPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java @@ -1,6 +1,6 @@ -package com.youlai.system.model.query; +package com.youlai.boot.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.Data; diff --git a/src/main/java/com/youlai/system/model/vo/ConfigVO.java b/src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java similarity index 95% rename from src/main/java/com/youlai/system/model/vo/ConfigVO.java rename to src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java index a27e971e..12bf2f47 100644 --- a/src/main/java/com/youlai/system/model/vo/ConfigVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/DeptVO.java similarity index 96% rename from src/main/java/com/youlai/system/model/vo/DeptVO.java rename to src/main/java/com/youlai/boot/system/model/vo/DeptVO.java index 4e0c5b3a..d2249f4d 100644 --- a/src/main/java/com/youlai/system/model/vo/DeptVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/DictPageVO.java similarity index 96% rename from src/main/java/com/youlai/system/model/vo/DictPageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java index f2590a36..80d43fe4 100644 --- a/src/main/java/com/youlai/system/model/vo/DictPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/GeneratorPreviewVO.java similarity index 91% rename from src/main/java/com/youlai/system/model/vo/GeneratorPreviewVO.java rename to src/main/java/com/youlai/boot/system/model/vo/GeneratorPreviewVO.java index c4e8f62b..1fd62aab 100644 --- a/src/main/java/com/youlai/system/model/vo/GeneratorPreviewVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/GeneratorPreviewVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/LogPageVO.java similarity index 93% rename from src/main/java/com/youlai/system/model/vo/LogPageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java index 78898686..253c34c0 100644 --- a/src/main/java/com/youlai/system/model/vo/LogPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java @@ -1,7 +1,7 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.enums.LogModuleEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/vo/MenuVO.java b/src/main/java/com/youlai/boot/system/model/vo/MenuVO.java similarity index 93% rename from src/main/java/com/youlai/system/model/vo/MenuVO.java rename to src/main/java/com/youlai/boot/system/model/vo/MenuVO.java index 6ca1545a..3b76fcda 100644 --- a/src/main/java/com/youlai/system/model/vo/MenuVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/MenuVO.java @@ -1,7 +1,7 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonInclude; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.boot.common.enums.MenuTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/model/vo/NoticeStatusVO.java b/src/main/java/com/youlai/boot/system/model/vo/NoticeStatusVO.java similarity index 100% rename from src/main/java/com/youlai/system/model/vo/NoticeStatusVO.java rename to src/main/java/com/youlai/boot/system/model/vo/NoticeStatusVO.java diff --git a/src/main/java/com/youlai/system/model/vo/NoticeVO.java b/src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java similarity index 100% rename from src/main/java/com/youlai/system/model/vo/NoticeVO.java rename to src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java diff --git a/src/main/java/com/youlai/system/model/vo/RolePageVO.java b/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java similarity index 94% rename from src/main/java/com/youlai/system/model/vo/RolePageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java index fc06a1db..86a1ce21 100644 --- a/src/main/java/com/youlai/system/model/vo/RolePageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/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/system/model/vo/RouteVO.java index 18dec3b1..8c786f02 100644 --- a/src/main/java/com/youlai/system/model/vo/RouteVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/TablePageVO.java similarity index 95% rename from src/main/java/com/youlai/system/model/vo/TablePageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/TablePageVO.java index aff66e51..970cd5a8 100644 --- a/src/main/java/com/youlai/system/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/TablePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/UserInfoVO.java similarity index 94% rename from src/main/java/com/youlai/system/model/vo/UserInfoVO.java rename to src/main/java/com/youlai/boot/system/model/vo/UserInfoVO.java index 9513e7a8..fc2d095d 100644 --- a/src/main/java/com/youlai/system/model/vo/UserInfoVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserInfoVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/UserPageVO.java similarity index 96% rename from src/main/java/com/youlai/system/model/vo/UserPageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java index b2d0aa2a..770a9424 100644 --- a/src/main/java/com/youlai/system/model/vo/UserPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/UserProfileVO.java similarity index 96% rename from src/main/java/com/youlai/system/model/vo/UserProfileVO.java rename to src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java index 448479a3..614f917b 100644 --- a/src/main/java/com/youlai/system/model/vo/UserProfileVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/VisitStatsVO.java similarity index 94% rename from src/main/java/com/youlai/system/model/vo/VisitStatsVO.java rename to src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java index 7cc5685e..0ede21e8 100644 --- a/src/main/java/com/youlai/system/model/vo/VisitStatsVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.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/system/model/vo/VisitTrendVO.java similarity index 92% rename from src/main/java/com/youlai/system/model/vo/VisitTrendVO.java rename to src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java index 2e686d58..07cb686f 100644 --- a/src/main/java/com/youlai/system/model/vo/VisitTrendVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.model.vo; +package com.youlai.boot.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/service/SysConfigService.java b/src/main/java/com/youlai/boot/system/service/ConfigService.java similarity index 81% rename from src/main/java/com/youlai/system/service/SysConfigService.java rename to src/main/java/com/youlai/boot/system/service/ConfigService.java index 21296ac7..988db94d 100644 --- a/src/main/java/com/youlai/system/service/SysConfigService.java +++ b/src/main/java/com/youlai/boot/system/service/ConfigService.java @@ -1,11 +1,11 @@ -package com.youlai.system.service; +package com.youlai.boot.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.system.model.entity.Config; +import com.youlai.boot.system.model.form.ConfigForm; +import com.youlai.boot.system.model.query.ConfigPageQuery; +import com.youlai.boot.system.model.vo.ConfigVO; /** * 系统配置Service接口 @@ -13,7 +13,7 @@ import com.youlai.system.model.vo.ConfigVO; * @author Theo * @since 2024-07-29 11:17:26 */ -public interface SysConfigService extends IService { +public interface ConfigService extends IService { /** * 分页查询系统配置 diff --git a/src/main/java/com/youlai/system/service/SysDeptService.java b/src/main/java/com/youlai/boot/system/service/DeptService.java similarity index 76% rename from src/main/java/com/youlai/system/service/SysDeptService.java rename to src/main/java/com/youlai/boot/system/service/DeptService.java index 1185b735..850a948e 100644 --- a/src/main/java/com/youlai/system/service/SysDeptService.java +++ b/src/main/java/com/youlai/boot/system/service/DeptService.java @@ -1,11 +1,11 @@ -package com.youlai.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -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.system.model.entity.Dept; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.form.DeptForm; +import com.youlai.boot.system.model.query.DeptQuery; +import com.youlai.boot.system.model.vo.DeptVO; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; * @author haoxr * @since 2021/8/22 */ -public interface SysDeptService extends IService { +public interface DeptService extends IService { /** * 部门列表 * diff --git a/src/main/java/com/youlai/boot/system/service/DictItemService.java b/src/main/java/com/youlai/boot/system/service/DictItemService.java new file mode 100644 index 00000000..f3114d68 --- /dev/null +++ b/src/main/java/com/youlai/boot/system/service/DictItemService.java @@ -0,0 +1,14 @@ +package com.youlai.boot.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.youlai.boot.system.model.entity.DictItem; + +/** + * 字典项 接口 + * + * @author Ray Hao + * @since 2023/3/4 + */ +public interface DictItemService extends IService { + +} diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/boot/system/service/DictService.java similarity index 78% rename from src/main/java/com/youlai/system/service/SysDictService.java rename to src/main/java/com/youlai/boot/system/service/DictService.java index 5f8b606d..1cf6c6a9 100644 --- a/src/main/java/com/youlai/system/service/SysDictService.java +++ b/src/main/java/com/youlai/boot/system/service/DictService.java @@ -1,12 +1,12 @@ -package com.youlai.system.service; +package com.youlai.boot.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.common.model.Option; +import com.youlai.boot.system.model.entity.Dict; +import com.youlai.boot.system.model.form.DictForm; +import com.youlai.boot.system.model.query.DictPageQuery; +import com.youlai.boot.system.model.vo.DictPageVO; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; * @author haoxr * @since 2022/10/12 */ -public interface SysDictService extends IService { +public interface DictService extends IService { /** * 字典分页列表 diff --git a/src/main/java/com/youlai/system/service/SysLogService.java b/src/main/java/com/youlai/boot/system/service/LogService.java similarity index 67% rename from src/main/java/com/youlai/system/service/SysLogService.java rename to src/main/java/com/youlai/boot/system/service/LogService.java index b0801e31..ccfece2c 100644 --- a/src/main/java/com/youlai/system/service/SysLogService.java +++ b/src/main/java/com/youlai/boot/system/service/LogService.java @@ -1,12 +1,12 @@ -package com.youlai.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.model.entity.SysLog; +import com.youlai.boot.system.model.entity.Log; 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.system.model.query.LogPageQuery; +import com.youlai.boot.system.model.vo.LogPageVO; +import com.youlai.boot.system.model.vo.VisitStatsVO; +import com.youlai.boot.system.model.vo.VisitTrendVO; import java.time.LocalDate; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; * @author Ray * @since 2.10.0 */ -public interface SysLogService extends IService { +public interface LogService extends IService { /** * 获取日志分页列表 diff --git a/src/main/java/com/youlai/system/service/SysMenuService.java b/src/main/java/com/youlai/boot/system/service/MenuService.java similarity index 73% rename from src/main/java/com/youlai/system/service/SysMenuService.java rename to src/main/java/com/youlai/boot/system/service/MenuService.java index b55a2369..a6b9f763 100644 --- a/src/main/java/com/youlai/system/service/SysMenuService.java +++ b/src/main/java/com/youlai/boot/system/service/MenuService.java @@ -1,13 +1,13 @@ -package com.youlai.system.service; +package com.youlai.boot.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.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.platform.generator.model.entity.GenConfig; +import com.youlai.boot.system.model.form.MenuForm; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.entity.Menu; +import com.youlai.boot.system.model.query.MenuQuery; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.vo.RouteVO; import java.util.List; import java.util.Set; @@ -18,7 +18,7 @@ import java.util.Set; * @author haoxr * @since 2020/11/06 */ -public interface SysMenuService extends IService { +public interface MenuService extends IService { /** * 获取菜单表格列表 diff --git a/src/main/java/com/youlai/system/service/NoticeService.java b/src/main/java/com/youlai/boot/system/service/NoticeService.java similarity index 100% rename from src/main/java/com/youlai/system/service/NoticeService.java rename to src/main/java/com/youlai/boot/system/service/NoticeService.java diff --git a/src/main/java/com/youlai/system/service/NoticeStatusService.java b/src/main/java/com/youlai/boot/system/service/NoticeStatusService.java similarity index 100% rename from src/main/java/com/youlai/system/service/NoticeStatusService.java rename to src/main/java/com/youlai/boot/system/service/NoticeStatusService.java diff --git a/src/main/java/com/youlai/system/service/SysRoleMenuService.java b/src/main/java/com/youlai/boot/system/service/RoleMenuService.java similarity index 86% rename from src/main/java/com/youlai/system/service/SysRoleMenuService.java rename to src/main/java/com/youlai/boot/system/service/RoleMenuService.java index 0532b835..dc9e47a4 100644 --- a/src/main/java/com/youlai/system/service/SysRoleMenuService.java +++ b/src/main/java/com/youlai/boot/system/service/RoleMenuService.java @@ -1,8 +1,8 @@ -package com.youlai.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.SysRoleMenu; +import com.youlai.boot.system.model.entity.RoleMenu; import java.util.List; import java.util.Set; @@ -13,7 +13,7 @@ import java.util.Set; * @author haoxr * @since 2.5.0 */ -public interface SysRoleMenuService extends IService { +public interface RoleMenuService extends IService { /** * 获取角色拥有的菜单ID集合 diff --git a/src/main/java/com/youlai/system/service/SysRoleService.java b/src/main/java/com/youlai/boot/system/service/RoleService.java similarity index 83% rename from src/main/java/com/youlai/system/service/SysRoleService.java rename to src/main/java/com/youlai/boot/system/service/RoleService.java index a03b0bcc..348af800 100644 --- a/src/main/java/com/youlai/system/service/SysRoleService.java +++ b/src/main/java/com/youlai/boot/system/service/RoleService.java @@ -1,13 +1,13 @@ -package com.youlai.system.service; +package com.youlai.boot.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.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.system.model.entity.Role; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.form.RoleForm; +import com.youlai.boot.system.model.query.RolePageQuery; +import com.youlai.boot.system.model.vo.RolePageVO; import java.util.List; import java.util.Set; @@ -18,7 +18,7 @@ import java.util.Set; * @author haoxr * @since 2022/6/3 */ -public interface SysRoleService extends IService { +public interface RoleService extends IService { /** * 角色分页列表 diff --git a/src/main/java/com/youlai/system/service/SysUserRoleService.java b/src/main/java/com/youlai/boot/system/service/UserRoleService.java similarity index 74% rename from src/main/java/com/youlai/system/service/SysUserRoleService.java rename to src/main/java/com/youlai/boot/system/service/UserRoleService.java index 5bb52b9d..697b86ca 100644 --- a/src/main/java/com/youlai/system/service/SysUserRoleService.java +++ b/src/main/java/com/youlai/boot/system/service/UserRoleService.java @@ -1,12 +1,12 @@ -package com.youlai.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.model.entity.SysUserRole; +import com.youlai.boot.system.model.entity.UserRole; import java.util.List; -public interface SysUserRoleService extends IService { +public interface UserRoleService extends IService { /** * 保存用户角色 diff --git a/src/main/java/com/youlai/system/service/SysUserService.java b/src/main/java/com/youlai/boot/system/service/UserService.java similarity index 82% rename from src/main/java/com/youlai/system/service/SysUserService.java rename to src/main/java/com/youlai/boot/system/service/UserService.java index 4a5ba81f..45eadd78 100644 --- a/src/main/java/com/youlai/system/service/SysUserService.java +++ b/src/main/java/com/youlai/boot/system/service/UserService.java @@ -1,17 +1,17 @@ -package com.youlai.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -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 com.youlai.boot.common.enums.ContactType; +import com.youlai.boot.system.model.dto.UserAuthInfo; +import com.youlai.boot.system.model.dto.UserExportDTO; +import com.youlai.boot.system.model.entity.User; +import com.youlai.boot.system.model.query.UserPageQuery; +import com.youlai.boot.system.model.vo.UserInfoVO; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.system.model.vo.UserProfileVO; +import com.youlai.boot.system.model.form.*; import java.util.List; @@ -21,7 +21,7 @@ import java.util.List; * @author haoxr * @since 2022/1/14 */ -public interface SysUserService extends IService { +public interface UserService extends IService { /** * 用户分页列表 diff --git a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java similarity index 60% rename from src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java index 097367d2..c7f8579f 100644 --- a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java @@ -1,23 +1,23 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.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.system.converter.ConfigConverter; +import com.youlai.boot.system.mapper.ConfigMapper; +import com.youlai.boot.system.model.entity.Config; +import com.youlai.boot.system.model.form.ConfigForm; +import com.youlai.boot.system.model.query.ConfigPageQuery; +import com.youlai.boot.system.model.vo.ConfigVO; +import com.youlai.boot.system.service.ConfigService; +import com.youlai.boot.core.security.util.SecurityUtils; import 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; @@ -32,11 +32,11 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysConfigServiceImpl extends ServiceImpl implements SysConfigService { +public class ConfigServiceImpl extends ServiceImpl implements ConfigService { - private final SysConfigMapper sysConfigMapper; + private final ConfigMapper configMapper; - private final SysConfigConverter sysConfigConverter; + private final ConfigConverter configConverter; private final RedisTemplate redisTemplate; @@ -57,16 +57,16 @@ public class SysConfigServiceImpl extends ServiceImpl page(ConfigPageQuery configPageQuery) { - Page page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); + Page page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); String keywords = configPageQuery.getKeywords(); - LambdaQueryWrapper query = new LambdaQueryWrapper() + LambdaQueryWrapper query = new LambdaQueryWrapper() .and(StringUtils.isNotBlank(keywords), - q -> q.like(SysConfig::getConfigKey, keywords) + q -> q.like(Config::getConfigKey, keywords) .or() - .like(SysConfig::getConfigName, keywords) + .like(Config::getConfigName, keywords) ); - Page pageList = this.page(page, query); - return sysConfigConverter.toPageVo(pageList); + Page pageList = this.page(page, query); + return configConverter.toPageVo(pageList); } /** @@ -78,11 +78,11 @@ public class SysConfigServiceImpl extends ServiceImpl().eq(SysConfig::getConfigKey, configForm.getConfigKey())) == 0, + super.count(new LambdaQueryWrapper().eq(Config::getConfigKey, configForm.getConfigKey())) == 0, "配置键已存在"); - SysConfig sysConfig = sysConfigConverter.toEntity(configForm); - sysConfig.setCreateBy(SecurityUtils.getUserId()); - return this.save(sysConfig); + Config config = configConverter.toEntity(configForm); + config.setCreateBy(SecurityUtils.getUserId()); + return this.save(config); } /** @@ -93,8 +93,8 @@ public class SysConfigServiceImpl extends ServiceImpl().eq(SysConfig::getConfigKey, configForm.getConfigKey()).ne(SysConfig::getId, id)) == 0, + super.count(new LambdaQueryWrapper().eq(Config::getConfigKey, configForm.getConfigKey()).ne(Config::getId, id)) == 0, "配置键已存在"); - SysConfig sysConfig = sysConfigConverter.toEntity(configForm); - sysConfig.setUpdateBy(SecurityUtils.getUserId()); - return this.updateById(sysConfig); + Config config = configConverter.toEntity(configForm); + config.setUpdateBy(SecurityUtils.getUserId()); + return this.updateById(config); } /** @@ -123,7 +123,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq(SysConfig::getId,id)); + return super.remove(new LambdaQueryWrapper().eq(Config::getId,id)); } return false; } @@ -136,9 +136,9 @@ public class SysConfigServiceImpl extends ServiceImpl list = this.list(); + List list = this.list(); if (list != null) { - Map map = list.stream().collect(Collectors.toMap(SysConfig::getConfigKey, SysConfig::getConfigValue)); + Map map = list.stream().collect(Collectors.toMap(Config::getConfigKey, Config::getConfigValue)); redisTemplate.opsForHash().putAll(RedisConstants.SYSTEM_CONFIG_KEY, map); return true; } diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java similarity index 76% rename from src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java index c2788aa3..98402189 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java @@ -1,21 +1,21 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.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.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 com.youlai.boot.system.converter.DeptConverter; +import com.youlai.boot.system.mapper.DeptMapper; +import com.youlai.boot.system.model.entity.Dept; +import com.youlai.boot.system.model.form.DeptForm; +import com.youlai.boot.system.model.query.DeptQuery; +import com.youlai.boot.system.model.vo.DeptVO; +import com.youlai.boot.common.constant.SymbolConstant; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.StatusEnum; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.service.DeptService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -32,7 +32,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { +public class DeptServiceImpl extends ServiceImpl implements DeptService { private final DeptConverter deptConverter; @@ -47,11 +47,11 @@ public class SysDeptServiceImpl extends ServiceImpl impl Integer status = queryParams.getStatus(); // 查询数据 - List deptList = this.list( - new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(keywords), SysDept::getName, keywords) - .eq(status != null, SysDept::getStatus, status) - .orderByAsc(SysDept::getSort) + List deptList = this.list( + new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(keywords), Dept::getName, keywords) + .eq(status != null, Dept::getStatus, status) + .orderByAsc(Dept::getSort) ); if (CollectionUtil.isEmpty(deptList)) { @@ -60,11 +60,11 @@ public class SysDeptServiceImpl extends ServiceImpl impl // 获取所有部门ID Set deptIds = deptList.stream() - .map(SysDept::getId) + .map(Dept::getId) .collect(Collectors.toSet()); // 获取父节点ID Set parentIds = deptList.stream() - .map(SysDept::getParentId) + .map(Dept::getParentId) .collect(Collectors.toSet()); // 获取根节点ID（递归的起点），即父节点ID中不包含在部门ID中的节点，注意这里不能拿顶级部门 O 作为根节点，因为部门筛选的时候 O 会被过滤掉 List rootIds = CollectionUtil.subtractToList(parentIds, deptIds); @@ -82,7 +82,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @param deptList 部门列表 * @return 部门树形列表 */ - public List recurDeptList(Long parentId, List deptList) { + public List recurDeptList(Long parentId, List deptList) { return deptList.stream() .filter(dept -> dept.getParentId().equals(parentId)) .map(dept -> { @@ -101,21 +101,21 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public List> listDeptOptions() { - List deptList = this.list(new LambdaQueryWrapper() - .eq(SysDept::getStatus, StatusEnum.ENABLE.getValue()) - .select(SysDept::getId, SysDept::getParentId, SysDept::getName) - .orderByAsc(SysDept::getSort) + List deptList = this.list(new LambdaQueryWrapper() + .eq(Dept::getStatus, StatusEnum.ENABLE.getValue()) + .select(Dept::getId, Dept::getParentId, Dept::getName) + .orderByAsc(Dept::getSort) ); if (CollectionUtil.isEmpty(deptList)) { return Collections.EMPTY_LIST; } Set deptIds = deptList.stream() - .map(SysDept::getId) + .map(Dept::getId) .collect(Collectors.toSet()); Set parentIds = deptList.stream() - .map(SysDept::getParentId) + .map(Dept::getParentId) .collect(Collectors.toSet()); List rootIds = CollectionUtil.subtractToList(parentIds, deptIds); @@ -136,13 +136,13 @@ public class SysDeptServiceImpl extends ServiceImpl impl public Long saveDept(DeptForm formData) { // 校验部门名称是否存在 String code = formData.getCode(); - long count = this.count(new LambdaQueryWrapper() - .eq(SysDept::getCode, code) + long count = this.count(new LambdaQueryWrapper() + .eq(Dept::getCode, code) ); Assert.isTrue(count == 0, "部门编号已存在"); // form->entity - SysDept entity = deptConverter.toEntity(formData); + Dept entity = deptConverter.toEntity(formData); // 生成部门路径(tree_path)，格式：父节点tree_path + , + 父节点ID，用于删除部门时级联删除子部门 String treePath = generateDeptTreePath(formData.getParentId()); @@ -164,7 +164,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ @Override public DeptForm getDeptForm(Long deptId) { - SysDept entity = this.getById(deptId); + Dept entity = this.getById(deptId); return deptConverter.toForm(entity); } @@ -180,15 +180,15 @@ public class SysDeptServiceImpl extends ServiceImpl impl public Long updateDept(Long deptId, DeptForm formData) { // 校验部门名称/部门编号是否存在 String code = formData.getCode(); - long count = this.count(new LambdaQueryWrapper() - .ne(SysDept::getId, deptId) - .eq(SysDept::getCode, code) + long count = this.count(new LambdaQueryWrapper() + .ne(Dept::getId, deptId) + .eq(Dept::getCode, code) ); Assert.isTrue(count == 0, "部门编号已存在"); // form->entity - SysDept entity = deptConverter.toEntity(formData); + Dept entity = deptConverter.toEntity(formData); entity.setId(deptId); // 生成部门路径(tree_path)，格式：父节点tree_path + , + 父节点ID，用于删除部门时级联删除子部门 @@ -209,7 +209,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @param deptList 部门列表 * @return 部门表格层级列表 */ - public static List> recurDeptTreeOptions(long parentId, List deptList) { + public static List> recurDeptTreeOptions(long parentId, List deptList) { return CollectionUtil.emptyIfNull(deptList).stream() .filter(dept -> dept.getParentId().equals(parentId)) .map(dept -> { @@ -236,8 +236,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl if (StrUtil.isNotBlank(ids)) { String[] menuIds = ids.split(SymbolConstant.COMMA); for (String deptId : menuIds) { - this.remove(new LambdaQueryWrapper() - .eq(SysDept::getId, deptId) + this.remove(new LambdaQueryWrapper() + .eq(Dept::getId, deptId) .or() .apply("CONCAT (',',tree_path,',') LIKE CONCAT('%,',{0},',%')", deptId)); } @@ -257,7 +257,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl if (SystemConstants.ROOT_NODE_ID.equals(parentId)) { treePath = String.valueOf(parentId); } else { - SysDept parent = this.getById(parentId); + Dept parent = this.getById(parentId); if (parent != null) { treePath = parent.getTreePath() + SymbolConstant.COMMA + parent.getId(); } diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java new file mode 100644 index 00000000..f5b73f84 --- /dev/null +++ b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java @@ -0,0 +1,24 @@ +package com.youlai.boot.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.youlai.boot.system.mapper.DictItemMapper; +import com.youlai.boot.system.model.entity.DictItem; +import com.youlai.boot.system.service.DictItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * 数据字典 服务实现类 + * + * @author haoxr + * @since 2022/10/12 + */ +@Service +@RequiredArgsConstructor +public class DictItemServiceImpl extends ServiceImpl implements DictItemService { + +} + + + + diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java similarity index 69% rename from src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java index 839dc9e6..8e3489a7 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -6,17 +6,17 @@ 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.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 com.youlai.boot.system.converter.DictConverter; +import com.youlai.boot.system.converter.DictItemConverter; +import com.youlai.boot.system.mapper.DictMapper; +import com.youlai.boot.system.model.entity.Dict; +import com.youlai.boot.system.model.entity.DictItem; +import com.youlai.boot.system.model.form.DictForm; +import com.youlai.boot.system.model.query.DictPageQuery; +import com.youlai.boot.system.model.vo.DictPageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.service.DictItemService; +import com.youlai.boot.system.service.DictService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,9 +32,9 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysDictServiceImpl extends ServiceImpl implements SysDictService { +public class DictServiceImpl extends ServiceImpl implements DictService { - private final SysDictItemService dictItemService; + private final DictItemService dictItemService; private final DictConverter dictConverter; private final DictItemConverter dictItemConverter; @@ -61,11 +61,11 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public boolean saveDict(DictForm dictForm) { // 保存字典 - SysDict entity = dictConverter.toEntity(dictForm); + Dict entity = dictConverter.toEntity(dictForm); // 校验 code 是否唯一 - long count = this.count(new LambdaQueryWrapper() - .eq(SysDict::getCode, entity.getCode()) + long count = this.count(new LambdaQueryWrapper() + .eq(Dict::getCode, entity.getCode()) ); Assert.isTrue(count == 0, "字典编码已存在"); @@ -73,7 +73,7 @@ public class SysDictServiceImpl extends ServiceImpl impl // 保存字典项 if (result) { List dictFormDictItems = dictForm.getDictItems(); - List dictItems = dictItemConverter.toEntity(dictFormDictItems); + List dictItems = dictItemConverter.toEntity(dictFormDictItems); dictItems.forEach(dictItem -> dictItem.setDictId(entity.getId())); dictItemService.saveBatch(dictItems); } @@ -89,13 +89,13 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public DictForm getDictForm(Long id) { // 获取字典 - SysDict entity = this.getById(id); + Dict entity = this.getById(id); Assert.isTrue(entity != null, "字典不存在"); DictForm dictForm = dictConverter.toForm(entity); // 获取字典项集合 - List dictItems = dictItemService.list(new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, id) + List dictItems = dictItemService.list(new LambdaQueryWrapper() + .eq(DictItem::getDictId, id) ); // 转换数据项 List dictItemList = dictItemConverter.toDictItem(dictItems); @@ -112,12 +112,12 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public boolean updateDict(Long id, DictForm dictForm) { // 更新字典 - SysDict entity = dictConverter.toEntity(dictForm); + Dict entity = dictConverter.toEntity(dictForm); // 校验 code 是否唯一 - long count = this.count(new LambdaQueryWrapper() - .eq(SysDict::getCode, entity.getCode()) - .ne(SysDict::getId, id) + long count = this.count(new LambdaQueryWrapper() + .eq(Dict::getCode, entity.getCode()) + .ne(Dict::getId, id) ); Assert.isTrue(count == 0, "字典编码已存在"); @@ -126,21 +126,21 @@ public class SysDictServiceImpl extends ServiceImpl impl if (result) { // 更新字典项 List dictFormDictItems = dictForm.getDictItems(); - List dictItems = dictItemConverter.toEntity(dictFormDictItems); + List dictItems = dictItemConverter.toEntity(dictFormDictItems); // 获取当前数据库中的字典项 - List currentDictItemEntities = dictItemService.list(new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, id) + List currentDictItemEntities = dictItemService.list(new LambdaQueryWrapper() + .eq(DictItem::getDictId, id) ); // 获取当前数据库中存在的字典项ID集合 Set currentDictItemIds = currentDictItemEntities.stream() - .map(SysDictItem::getId) + .map(DictItem::getId) .collect(Collectors.toSet()); // 获取新提交的字典项ID集合 Set newAttrIds = dictItems.stream() - .map(SysDictItem::getId) + .map(DictItem::getId) .filter(Objects::nonNull) .collect(Collectors.toSet()); @@ -154,7 +154,7 @@ public class SysDictServiceImpl extends ServiceImpl impl } // 更新或新增字典项 - for (SysDictItem dictItem : dictItems) { + for (DictItem dictItem : dictItems) { if (dictItem.getId() != null && currentDictItemIds.contains(dictItem.getId())) { // 更新现有字典项 dictItemService.updateById(dictItem); @@ -187,8 +187,8 @@ public class SysDictServiceImpl extends ServiceImpl impl if (result) { // 删除字典下的字典项 dictItemService.remove( - new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, id) + new LambdaQueryWrapper() + .eq(DictItem::getDictId, id) ); } } @@ -202,9 +202,9 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public List> listDictItemsByCode(String code) { // 根据字典编码获取字典ID - SysDict dict = this.getOne(new LambdaQueryWrapper() - .eq(SysDict::getCode, code) - .select(SysDict::getId) + Dict dict = this.getOne(new LambdaQueryWrapper() + .eq(Dict::getCode, code) + .select(Dict::getId) .last("limit 1") ); // 如果字典不存在，则返回空集合 @@ -213,9 +213,9 @@ public class SysDictServiceImpl extends ServiceImpl impl } // 获取字典项 - List dictItems = dictItemService.list( - new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, dict.getId()) + List dictItems = dictItemService.list( + new LambdaQueryWrapper() + .eq(DictItem::getDictId, dict.getId()) ); // 转换为 Option @@ -227,9 +227,9 @@ public class SysDictServiceImpl extends ServiceImpl impl */ @Override public List> getDictList() { - return this.list(new LambdaQueryWrapper() - .eq(SysDict::getStatus, 1) - .select(SysDict::getName, SysDict::getCode) + return this.list(new LambdaQueryWrapper() + .eq(Dict::getStatus, 1) + .select(Dict::getName, Dict::getCode) ).stream() .map(dict -> new Option<>(dict.getCode(), dict.getName())) .toList(); diff --git a/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java similarity index 85% rename from src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java index dddf28d2..c8887e14 100644 --- a/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java @@ -1,16 +1,15 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.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.system.service.SysLogService; -import com.youlai.system.mapper.SysLogMapper; +import com.youlai.boot.system.mapper.LogMapper; +import com.youlai.boot.system.model.bo.VisitCount; +import com.youlai.boot.system.model.entity.Log; +import com.youlai.boot.system.model.query.LogPageQuery; +import com.youlai.boot.system.model.vo.LogPageVO; +import com.youlai.boot.system.model.vo.VisitStatsVO; +import com.youlai.boot.system.model.vo.VisitTrendVO; +import com.youlai.boot.system.service.LogService; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -27,8 +26,8 @@ import java.util.stream.Collectors; * @since 2.10.0 */ @Service -public class SysLogServiceImpl extends ServiceImpl - implements SysLogService { +public class LogServiceImpl extends ServiceImpl + implements LogService { /** * 获取日志分页列表 diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java similarity index 82% rename from src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java index bccde913..ddd927c9 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.system.service.impl; +package com.youlai.boot.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.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 com.youlai.boot.system.converter.MenuConverter; +import com.youlai.boot.system.mapper.MenuMapper; +import com.youlai.boot.system.model.bo.RouteBO; +import com.youlai.boot.platform.generator.model.entity.GenConfig; +import com.youlai.boot.system.model.entity.Menu; +import com.youlai.boot.system.model.form.MenuForm; +import com.youlai.boot.system.model.query.MenuQuery; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.vo.RouteVO; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.MenuTypeEnum; +import com.youlai.boot.common.enums.StatusEnum; +import com.youlai.boot.common.model.KeyValue; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.service.MenuService; +import com.youlai.boot.system.service.RoleMenuService; import lombok.RequiredArgsConstructor; 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.*; @@ -43,11 +42,11 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { +public class MenuServiceImpl extends ServiceImpl implements MenuService { private final MenuConverter menuConverter; - private final SysRoleMenuService roleMenuService; + private final RoleMenuService roleMenuService; /** @@ -57,18 +56,18 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public List listMenus(MenuQuery queryParams) { - List menus = this.list(new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(queryParams.getKeywords()), SysMenu::getName, queryParams.getKeywords()) - .orderByAsc(SysMenu::getSort) + List menus = this.list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(queryParams.getKeywords()), Menu::getName, queryParams.getKeywords()) + .orderByAsc(Menu::getSort) ); // 获取所有菜单ID Set menuIds = menus.stream() - .map(SysMenu::getId) + .map(Menu::getId) .collect(Collectors.toSet()); // 获取所有父级ID Set parentIds = menus.stream() - .map(SysMenu::getParentId) + .map(Menu::getParentId) .collect(Collectors.toSet()); // 获取根节点ID（递归的起点），即父节点ID中不包含在部门ID中的节点，注意这里不能拿顶级菜单 O 作为根节点，因为菜单筛选的时候 O 会被过滤掉 @@ -89,7 +88,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @param menuList 菜单列表 * @return 菜单列表 */ - private List buildMenuTree(Long parentId, List menuList) { + private List buildMenuTree(Long parentId, List menuList) { return CollectionUtil.emptyIfNull(menuList) .stream() .filter(menu -> menu.getParentId().equals(parentId)) @@ -108,9 +107,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public List