diff --git a/pom.xml b/pom.xml index 7122b761..a0876e5d 100644 --- a/pom.xml +++ b/pom.xml @@ -37,10 +37,12 @@ 3.2.1 - + 8.5.2 4.8.1 + 3.16.3 + 1.6.2 15.4 @@ -174,13 +176,19 @@ spring-boot-starter-validation - + io.minio minio ${minio.version} + + com.aliyun.oss + aliyun-sdk-oss + ${aliyun-sdk-oss.version} + + com.github.whvcse diff --git a/src/main/java/com/youlai/system/framework/resubmit/ResubmitAspect.java b/src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java similarity index 72% rename from src/main/java/com/youlai/system/framework/resubmit/ResubmitAspect.java rename to src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java index 131bb2e4..6783ba3d 100644 --- a/src/main/java/com/youlai/system/framework/resubmit/ResubmitAspect.java +++ b/src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java @@ -1,10 +1,11 @@ -package com.youlai.system.framework.resubmit; +package com.youlai.system.aspect; import cn.hutool.core.util.StrUtil; import com.youlai.system.common.exception.BusinessException; import com.youlai.system.common.result.ResultCode; import com.youlai.system.common.util.RequestUtils; -import com.youlai.system.framework.security.JwtTokenManager; +import com.youlai.system.common.annotation.PreventDuplicateSubmit; +import com.youlai.system.security.JwtTokenManager; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -21,50 +22,48 @@ import org.springframework.web.context.request.ServletRequestAttributes; import java.util.concurrent.TimeUnit; /** - * 防重复提交切面 + * 处理重复提交的切面 * - * @author : haoxr - * @since : 2023/05/09 + * @author haoxr + * @since 2023/05/09 */ @Aspect @Component @Slf4j @RequiredArgsConstructor -public class ResubmitAspect { +public class DuplicateSubmitAspect { private final RedissonClient redissonClient; private final JwtTokenManager jwtTokenManager; - private static final String RESUBMIT_LOCK_PREFIX = "LOCK:RESUBMIT:"; /** * 防重复提交切点 */ - @Pointcut("@annotation(resubmit)") - public void preventDuplicateSubmitPointCut(Resubmit resubmit) { + @Pointcut("@annotation(preventDuplicateSubmit)") + public void preventDuplicateSubmitPointCut(PreventDuplicateSubmit preventDuplicateSubmit) { log.info("定义防重复提交切点"); } - @Around("preventDuplicateSubmitPointCut(resubmit)") - public Object doAround(ProceedingJoinPoint pjp, Resubmit resubmit) throws Throwable { + @Around("preventDuplicateSubmitPointCut(preventDuplicateSubmit)") + public Object doAround(ProceedingJoinPoint pjp, PreventDuplicateSubmit preventDuplicateSubmit) throws Throwable { String resubmitLockKey = generateResubmitLockKey(); if (resubmitLockKey != null) { - int expire = resubmit.expire(); // 防重提交锁过期时间 + int expire = preventDuplicateSubmit.expire(); // 防重提交锁过期时间 RLock lock = redissonClient.getLock(resubmitLockKey); boolean lockResult = lock.tryLock(0, expire, TimeUnit.SECONDS); // 获取锁失败，直接返回 false if (!lockResult) { throw new BusinessException(ResultCode.REPEAT_SUBMIT_ERROR); // 抛出重复提交提示信息 } } - Object result = pjp.proceed(); - return result; + return pjp.proceed(); } /** - * 获取防重提交锁的 key + * 获取重复提交锁的 key */ private String generateResubmitLockKey() { String resubmitLockKey = null; @@ -72,7 +71,7 @@ public class ResubmitAspect { String jwt = RequestUtils.resolveToken(request); if (StrUtil.isNotBlank(jwt)) { String jti = (String) jwtTokenManager.getTokenClaims(jwt).get("jti"); - resubmitLockKey = RESUBMIT_LOCK_PREFIX + jti + ":" + request.getMethod() + "-" + request.getRequestURI() + "-"; + resubmitLockKey = RESUBMIT_LOCK_PREFIX + jti + ":" + request.getMethod() + "-" + request.getRequestURI(); } return resubmitLockKey; } diff --git a/src/main/java/com/youlai/system/framework/mybatisplus/DataPermission.java b/src/main/java/com/youlai/system/common/annotation/DataPermission.java similarity index 89% rename from src/main/java/com/youlai/system/framework/mybatisplus/DataPermission.java rename to src/main/java/com/youlai/system/common/annotation/DataPermission.java index bd53fc9b..fa1cbb1f 100644 --- a/src/main/java/com/youlai/system/framework/mybatisplus/DataPermission.java +++ b/src/main/java/com/youlai/system/common/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package com.youlai.system.framework.mybatisplus; +package com.youlai.system.common.annotation; import java.lang.annotation.*; @@ -8,7 +8,7 @@ import java.lang.annotation.*; * https://gitee.com/baomidou/mybatis-plus/issues/I37I90 * * @author zc - * @date 2021-12-10 + * @since 2021-12-10 */ @Documented @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/youlai/system/framework/resubmit/Resubmit.java b/src/main/java/com/youlai/system/common/annotation/PreventDuplicateSubmit.java similarity index 68% rename from src/main/java/com/youlai/system/framework/resubmit/Resubmit.java rename to src/main/java/com/youlai/system/common/annotation/PreventDuplicateSubmit.java index 0226f946..b7bcdb87 100644 --- a/src/main/java/com/youlai/system/framework/resubmit/Resubmit.java +++ b/src/main/java/com/youlai/system/common/annotation/PreventDuplicateSubmit.java @@ -1,19 +1,19 @@ -package com.youlai.system.framework.resubmit; +package com.youlai.system.common.annotation; import java.lang.annotation.*; /** - * 防重提交注解 + * 防止重复提交注解 * * @author haoxr - * @since 2023/5/9 + * @since 2.3.0 */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -public @interface Resubmit { +public @interface PreventDuplicateSubmit { /** * 防重提交锁过期时间(秒) diff --git a/src/main/java/com/youlai/system/common/base/BasePageQuery.java b/src/main/java/com/youlai/system/common/base/BasePageQuery.java index e9c1dac8..a4e176b2 100644 --- a/src/main/java/com/youlai/system/common/base/BasePageQuery.java +++ b/src/main/java/com/youlai/system/common/base/BasePageQuery.java @@ -8,7 +8,7 @@ import lombok.Data; * 基础分页请求对象 * * @author haoxr - * @date 2021/2/28 + * @since 2021/2/28 */ @Data @Schema diff --git a/src/main/java/com/youlai/system/common/base/BaseVO.java b/src/main/java/com/youlai/system/common/base/BaseVO.java index d8c6e35a..c33d932e 100644 --- a/src/main/java/com/youlai/system/common/base/BaseVO.java +++ b/src/main/java/com/youlai/system/common/base/BaseVO.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 视图对象基类 * * @author haoxr - * @date 2022/10/22 + * @since 2022/10/22 */ @Data @ToString diff --git a/src/main/java/com/youlai/system/common/base/IBaseEnum.java b/src/main/java/com/youlai/system/common/base/IBaseEnum.java index 96df02b4..c0be080e 100644 --- a/src/main/java/com/youlai/system/common/base/IBaseEnum.java +++ b/src/main/java/com/youlai/system/common/base/IBaseEnum.java @@ -10,7 +10,7 @@ import java.util.Objects; * 枚举通用接口 * * @author haoxr - * @date 2022/3/27 12:06 + * @since 2022/3/27 12:06 */ public interface IBaseEnum { diff --git a/src/main/java/com/youlai/system/common/constant/ExcelConstants.java b/src/main/java/com/youlai/system/common/constant/ExcelConstants.java index b0fbe9a8..3ba17a43 100644 --- a/src/main/java/com/youlai/system/common/constant/ExcelConstants.java +++ b/src/main/java/com/youlai/system/common/constant/ExcelConstants.java @@ -3,8 +3,8 @@ package com.youlai.system.common.constant; /** * Excel 常量 * - * @author: haoxr - * @date: 2023/03/24 + * @author haoxr + * @since 2023/03/24 */ public interface ExcelConstants { diff --git a/src/main/java/com/youlai/system/common/constant/SecurityConstants.java b/src/main/java/com/youlai/system/common/constant/SecurityConstants.java index aa49b572..74b4e8a6 100644 --- a/src/main/java/com/youlai/system/common/constant/SecurityConstants.java +++ b/src/main/java/com/youlai/system/common/constant/SecurityConstants.java @@ -3,8 +3,8 @@ package com.youlai.system.common.constant; /** * Security 常量 * - * @author: haoxr - * @date: 2023/03/24 + * @author haoxr + * @since 2023/03/24 */ public interface SecurityConstants { diff --git a/src/main/java/com/youlai/system/framework/easycaptcha/enums/CaptchaTypeEnum.java b/src/main/java/com/youlai/system/common/enums/CaptchaTypeEnum.java similarity index 74% rename from src/main/java/com/youlai/system/framework/easycaptcha/enums/CaptchaTypeEnum.java rename to src/main/java/com/youlai/system/common/enums/CaptchaTypeEnum.java index 61d1d586..ba9ecf67 100644 --- a/src/main/java/com/youlai/system/framework/easycaptcha/enums/CaptchaTypeEnum.java +++ b/src/main/java/com/youlai/system/common/enums/CaptchaTypeEnum.java @@ -1,10 +1,10 @@ -package com.youlai.system.framework.easycaptcha.enums; +package com.youlai.system.common.enums; /** * EasyCaptcha 验证码类型枚举 * - * @author: haoxr - * @date: 2023/03/24 + * @author haoxr + * @since 2023/03/24 */ public enum CaptchaTypeEnum { diff --git a/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java b/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java index f9e35f1b..50a1e696 100644 --- a/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java +++ b/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java @@ -7,7 +7,7 @@ import lombok.Getter; * 数据权限枚举 * * @author haoxr - * @date 2022/10/14 + * @since 2022/10/14 */ public enum DataScopeEnum implements IBaseEnum { diff --git a/src/main/java/com/youlai/system/common/enums/GenderEnum.java b/src/main/java/com/youlai/system/common/enums/GenderEnum.java index 7fb31599..a576ec5d 100644 --- a/src/main/java/com/youlai/system/common/enums/GenderEnum.java +++ b/src/main/java/com/youlai/system/common/enums/GenderEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; * 性别枚举 * * @author haoxr - * @date 2022/10/14 + * @since 2022/10/14 */ @Schema(enumAsRef = true) public enum GenderEnum implements IBaseEnum { diff --git a/src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java b/src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java index 7767ffa0..91b6c891 100644 --- a/src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java +++ b/src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; * 菜单类型枚举 * * @author haoxr - * @date 2022/4/23 9:36 + * @since 2022/4/23 9:36 */ public enum MenuTypeEnum implements IBaseEnum { diff --git a/src/main/java/com/youlai/system/common/enums/StatusEnum.java b/src/main/java/com/youlai/system/common/enums/StatusEnum.java index 6caa2610..ba6bf0bf 100644 --- a/src/main/java/com/youlai/system/common/enums/StatusEnum.java +++ b/src/main/java/com/youlai/system/common/enums/StatusEnum.java @@ -7,7 +7,7 @@ import lombok.Getter; * 状态枚举 * * @author haoxr - * @date 2022/10/14 + * @since 2022/10/14 */ public enum StatusEnum implements IBaseEnum { diff --git a/src/main/java/com/youlai/system/common/exception/BusinessException.java b/src/main/java/com/youlai/system/common/exception/BusinessException.java index 83442f31..a9f96205 100644 --- a/src/main/java/com/youlai/system/common/exception/BusinessException.java +++ b/src/main/java/com/youlai/system/common/exception/BusinessException.java @@ -7,7 +7,7 @@ import lombok.Getter; * 自定义业务异常 * * @author haoxr - * @date 2022/7/31 + * @since 2022/7/31 */ @Getter public class BusinessException extends RuntimeException { diff --git a/src/main/java/com/youlai/system/pojo/vo/Option.java b/src/main/java/com/youlai/system/common/model/Option.java similarity index 93% rename from src/main/java/com/youlai/system/pojo/vo/Option.java rename to src/main/java/com/youlai/system/common/model/Option.java index f3c325d7..3d43761c 100644 --- a/src/main/java/com/youlai/system/pojo/vo/Option.java +++ b/src/main/java/com/youlai/system/common/model/Option.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.common.model; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; @@ -11,7 +11,7 @@ import java.util.List; * 下拉选项对象 * * @author haoxr - * @date 2022/1/22 + * @since 2022/1/22 */ @Schema(description ="下拉选项对象") @Data diff --git a/src/main/java/com/youlai/system/common/result/PageResult.java b/src/main/java/com/youlai/system/common/result/PageResult.java index 2a6a71bc..86c99a33 100644 --- a/src/main/java/com/youlai/system/common/result/PageResult.java +++ b/src/main/java/com/youlai/system/common/result/PageResult.java @@ -10,7 +10,7 @@ import java.util.List; * 分页响应结构体 * * @author haoxr - * @date 2022/2/18 23:29 + * @since 2022/2/18 23:29 */ @Data public class PageResult implements Serializable { diff --git a/src/main/java/com/youlai/system/common/result/Result.java b/src/main/java/com/youlai/system/common/result/Result.java index b71909e2..1be4e529 100644 --- a/src/main/java/com/youlai/system/common/result/Result.java +++ b/src/main/java/com/youlai/system/common/result/Result.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 统一响应结构体 * * @author haoxr - * @date 2022/1/30 + * @since 2022/1/30 **/ @Data public class Result implements Serializable { diff --git a/src/main/java/com/youlai/system/common/result/ResultCode.java b/src/main/java/com/youlai/system/common/result/ResultCode.java index 6da7e27c..772fc8df 100644 --- a/src/main/java/com/youlai/system/common/result/ResultCode.java +++ b/src/main/java/com/youlai/system/common/result/ResultCode.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 响应码枚举 * * @author haoxr - * @date 2020-06-23 + * @since 2020-06-23 **/ @AllArgsConstructor @NoArgsConstructor diff --git a/src/main/java/com/youlai/system/common/util/ExcelUtils.java b/src/main/java/com/youlai/system/common/util/ExcelUtils.java index d9ba301c..aa766ea1 100644 --- a/src/main/java/com/youlai/system/common/util/ExcelUtils.java +++ b/src/main/java/com/youlai/system/common/util/ExcelUtils.java @@ -1,21 +1,20 @@ package com.youlai.system.common.util; import com.alibaba.excel.EasyExcel; -import com.youlai.system.framework.easyexcel.MyAnalysisEventListener; +import com.youlai.system.listener.easyexcel.MyAnalysisEventListener; import java.io.InputStream; /** * Excel 工具类 * - * @author: haoxr - * @date: 2023/03/01 + * @author haoxr + * @since 2023/03/01 */ public class ExcelUtils { public static String importExcel(InputStream is, Class clazz, MyAnalysisEventListener listener) { EasyExcel.read(is, clazz, listener).sheet().doRead(); - String msg = listener.getMsg(); - return msg; + return listener.getMsg(); } } diff --git a/src/main/java/com/youlai/system/common/util/ResponseUtils.java b/src/main/java/com/youlai/system/common/util/ResponseUtils.java index 059b6872..bad0e16f 100644 --- a/src/main/java/com/youlai/system/common/util/ResponseUtils.java +++ b/src/main/java/com/youlai/system/common/util/ResponseUtils.java @@ -14,7 +14,7 @@ import java.io.IOException; * 响应工具类 * * @author haoxr - * @date 2022/10/18 + * @since 2022/10/18 */ public class ResponseUtils { diff --git a/src/main/java/com/youlai/system/framework/security/util/SecurityUtils.java b/src/main/java/com/youlai/system/common/util/SecurityUtils.java similarity index 96% rename from src/main/java/com/youlai/system/framework/security/util/SecurityUtils.java rename to src/main/java/com/youlai/system/common/util/SecurityUtils.java index bc10ac24..ccd90aab 100644 --- a/src/main/java/com/youlai/system/framework/security/util/SecurityUtils.java +++ b/src/main/java/com/youlai/system/common/util/SecurityUtils.java @@ -1,10 +1,10 @@ -package com.youlai.system.framework.security.util; +package com.youlai.system.common.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.framework.security.userdetails.SysUserDetails; +import com.youlai.system.security.userdetails.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/framework/easycaptcha/config/EasyCaptchaConfig.java b/src/main/java/com/youlai/system/config/CaptchaConfig.java similarity index 82% rename from src/main/java/com/youlai/system/framework/easycaptcha/config/EasyCaptchaConfig.java rename to src/main/java/com/youlai/system/config/CaptchaConfig.java index 8f7eefc2..3f84787c 100644 --- a/src/main/java/com/youlai/system/framework/easycaptcha/config/EasyCaptchaConfig.java +++ b/src/main/java/com/youlai/system/config/CaptchaConfig.java @@ -1,6 +1,6 @@ -package com.youlai.system.framework.easycaptcha.config; +package com.youlai.system.config; -import com.youlai.system.framework.easycaptcha.enums.CaptchaTypeEnum; +import com.youlai.system.common.enums.CaptchaTypeEnum; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -10,13 +10,13 @@ import java.awt.*; /** * EasyCaptcha 配置类 * - * @author: haoxr - * @date: 2023/03/24 + * @author haoxr + * @since 2023/03/24 */ @ConfigurationProperties(prefix = "easy-captcha") @Configuration @Data -public class EasyCaptchaConfig { +public class CaptchaConfig { /** * 验证码类型 diff --git a/src/main/java/com/youlai/system/config/CorsConfig.java b/src/main/java/com/youlai/system/config/CorsConfig.java index cd25c6f1..4d9fc035 100644 --- a/src/main/java/com/youlai/system/config/CorsConfig.java +++ b/src/main/java/com/youlai/system/config/CorsConfig.java @@ -10,10 +10,10 @@ import org.springframework.web.filter.CorsFilter; import java.util.Collections; /** - * CORS资源共享配置 + * CORS 资源共享配置 * * @author haoxr - * @date 2023/4/17 + * @since 2023/4/17 */ @Configuration public class CorsConfig { diff --git a/src/main/java/com/youlai/system/config/MybatisPlusConfig.java b/src/main/java/com/youlai/system/config/MybatisPlusConfig.java index f53124b5..717b4e7c 100644 --- a/src/main/java/com/youlai/system/config/MybatisPlusConfig.java +++ b/src/main/java/com/youlai/system/config/MybatisPlusConfig.java @@ -5,8 +5,8 @@ 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.framework.mybatisplus.MyDataPermissionHandler; -import com.youlai.system.framework.mybatisplus.MyMetaObjectHandler; +import com.youlai.system.handler.mybatisplus.MyDataPermissionHandler; +import com.youlai.system.handler.mybatisplus.MyMetaObjectHandler; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -23,7 +23,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; public class MybatisPlusConfig { - @Value("${system-config.data-permission.enabled}") + @Value("${system.config.data-permission-enabled}") private Boolean dataPermissionEnabled; /** diff --git a/src/main/java/com/youlai/system/framework/security/config/SecurityConfig.java b/src/main/java/com/youlai/system/config/SecurityConfig.java similarity index 65% rename from src/main/java/com/youlai/system/framework/security/config/SecurityConfig.java rename to src/main/java/com/youlai/system/config/SecurityConfig.java index 5bfeca75..a6bc22d0 100644 --- a/src/main/java/com/youlai/system/framework/security/config/SecurityConfig.java +++ b/src/main/java/com/youlai/system/config/SecurityConfig.java @@ -1,20 +1,21 @@ -package com.youlai.system.framework.security.config; +package com.youlai.system.config; import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.framework.security.filter.JwtAuthenticationFilter; -import com.youlai.system.framework.security.exception.MyAccessDeniedHandler; -import com.youlai.system.framework.security.exception.MyAuthenticationEntryPoint; -import com.youlai.system.framework.security.JwtTokenManager; -import com.youlai.system.framework.security.filter.VerifyCodeFilter; +import com.youlai.system.filter.JwtAuthenticationFilter; +import com.youlai.system.security.exception.MyAccessDeniedHandler; +import com.youlai.system.security.exception.MyAuthenticationEntryPoint; +import com.youlai.system.security.JwtTokenManager; +import com.youlai.system.filter.VerifyCodeFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; @@ -25,31 +26,33 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic * Spring Security 权限配置 * * @author haoxr - * @date 2023/2/17 + * @since 2023/2/17 */ @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableMethodSecurity @RequiredArgsConstructor public class SecurityConfig { - private final MyAuthenticationEntryPoint myAuthenticationEntryPoint; - private final MyAccessDeniedHandler myAccessDeniedHandler; + private final MyAuthenticationEntryPoint authenticationEntryPoint; + private final MyAccessDeniedHandler accessDeniedHandler; private final JwtTokenManager jwtTokenManager; @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http - .csrf().disable() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() - .authorizeHttpRequests() - .requestMatchers(SecurityConstants.LOGIN_PATH).permitAll() // 登录接口放行但会走过滤器链-验证码校验 - .anyRequest().authenticated() - .and() - .exceptionHandling() - .authenticationEntryPoint(myAuthenticationEntryPoint) - .accessDeniedHandler(myAccessDeniedHandler) + .authorizeHttpRequests(requestMatcherRegistry -> + requestMatcherRegistry.requestMatchers(SecurityConstants.LOGIN_PATH).permitAll() + .anyRequest().authenticated() + ) + .sessionManagement(configurer -> configurer.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .exceptionHandling(httpSecurityExceptionHandlingConfigurer -> + httpSecurityExceptionHandlingConfigurer + .authenticationEntryPoint(authenticationEntryPoint) + .accessDeniedHandler(accessDeniedHandler) + ) + .csrf(AbstractHttpConfigurer::disable) + ; // 验证码校验过滤器 @@ -63,7 +66,6 @@ public class SecurityConfig { /** * 不走过滤器链的放行配置 * - * @return */ @Bean public WebSecurityCustomizer webSecurityCustomizer() { @@ -74,7 +76,8 @@ public class SecurityConfig { "/doc.html", "/swagger-resources/**", "/v3/api-docs/**", - "/swagger-ui/**" + "/swagger-ui/**", + "/ws/**" ); } diff --git a/src/main/java/com/youlai/system/config/SwaggerConfig.java b/src/main/java/com/youlai/system/config/SwaggerConfig.java index 5f925405..e6a70bb7 100644 --- a/src/main/java/com/youlai/system/config/SwaggerConfig.java +++ b/src/main/java/com/youlai/system/config/SwaggerConfig.java @@ -20,7 +20,7 @@ import java.util.TreeMap; * Spring Doc FAQ: https://springdoc.org/#faq * * @author haoxr - * @date 2023/2/17 + * @since 2023/2/17 */ @Configuration public class SwaggerConfig { diff --git a/src/main/java/com/youlai/system/framework/xxljob/XxlJobConfig.java b/src/main/java/com/youlai/system/config/XxlJobConfig.java similarity index 91% rename from src/main/java/com/youlai/system/framework/xxljob/XxlJobConfig.java rename to src/main/java/com/youlai/system/config/XxlJobConfig.java index 967ffe58..916a7bcf 100644 --- a/src/main/java/com/youlai/system/framework/xxljob/XxlJobConfig.java +++ b/src/main/java/com/youlai/system/config/XxlJobConfig.java @@ -1,4 +1,4 @@ -package com.youlai.system.framework.xxljob; +package com.youlai.system.config; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.extern.slf4j.Slf4j; @@ -13,7 +13,8 @@ import org.springframework.context.annotation.Configuration; * @author xuxueli 2017-04-28 */ @Configuration -@ConditionalOnProperty(name = "xxl.job.enabled")// xxl.job.enabled = true 才会自动配置 +// system.config.xxl-job-enabled = true 才会自动装配 +@ConditionalOnProperty(name = "system.config.xxl-job-enabled") @Slf4j public class XxlJobConfig { diff --git a/src/main/java/com/youlai/system/controller/AuthController.java b/src/main/java/com/youlai/system/controller/AuthController.java index aa901606..91be7665 100644 --- a/src/main/java/com/youlai/system/controller/AuthController.java +++ b/src/main/java/com/youlai/system/controller/AuthController.java @@ -4,10 +4,10 @@ import cn.hutool.core.util.StrUtil; import com.youlai.system.common.constant.SecurityConstants; import com.youlai.system.common.result.Result; import com.youlai.system.common.util.RequestUtils; -import com.youlai.system.framework.easycaptcha.service.EasyCaptchaService; -import com.youlai.system.pojo.dto.CaptchaResult; -import com.youlai.system.pojo.dto.LoginResult; -import com.youlai.system.framework.security.JwtTokenManager; +import com.youlai.system.security.captcha.EasyCaptchaService; +import com.youlai.system.model.dto.CaptchaResult; +import com.youlai.system.model.dto.LoginResult; +import com.youlai.system.security.JwtTokenManager; import io.jsonwebtoken.Claims; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; diff --git a/src/main/java/com/youlai/system/controller/SysDeptController.java b/src/main/java/com/youlai/system/controller/SysDeptController.java index 7ceee0a7..6e92e6f8 100644 --- a/src/main/java/com/youlai/system/controller/SysDeptController.java +++ b/src/main/java/com/youlai/system/controller/SysDeptController.java @@ -1,11 +1,11 @@ package com.youlai.system.controller; -import com.youlai.system.framework.resubmit.Resubmit; -import com.youlai.system.pojo.vo.Option; +import com.youlai.system.common.annotation.PreventDuplicateSubmit; +import com.youlai.system.common.model.Option; import com.youlai.system.common.result.Result; -import com.youlai.system.pojo.form.DeptForm; -import com.youlai.system.pojo.query.DeptQuery; -import com.youlai.system.pojo.vo.DeptVO; +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.service.SysDeptService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -59,7 +59,7 @@ public class SysDeptController { @Operation(summary = "新增部门", security = {@SecurityRequirement(name = "Authorization")}) @PostMapping @PreAuthorize("@ss.hasPerm('sys:dept:add')") - @Resubmit + @PreventDuplicateSubmit 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/system/controller/SysDictController.java index 94bd7a3b..e374922e 100644 --- a/src/main/java/com/youlai/system/controller/SysDictController.java +++ b/src/main/java/com/youlai/system/controller/SysDictController.java @@ -3,14 +3,14 @@ package com.youlai.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.framework.resubmit.Resubmit; -import com.youlai.system.pojo.form.DictForm; -import com.youlai.system.pojo.form.DictTypeForm; -import com.youlai.system.pojo.query.DictPageQuery; -import com.youlai.system.pojo.query.DictTypePageQuery; -import com.youlai.system.pojo.vo.DictPageVO; -import com.youlai.system.pojo.vo.DictTypePageVO; -import com.youlai.system.pojo.vo.Option; +import com.youlai.system.common.annotation.PreventDuplicateSubmit; +import com.youlai.system.model.form.DictForm; +import com.youlai.system.model.form.DictTypeForm; +import com.youlai.system.model.query.DictPageQuery; +import com.youlai.system.model.query.DictTypePageQuery; +import com.youlai.system.model.vo.DictPageVO; +import com.youlai.system.model.vo.DictTypePageVO; +import com.youlai.system.common.model.Option; import com.youlai.system.service.SysDictService; import com.youlai.system.service.SysDictTypeService; import io.swagger.v3.oas.annotations.Parameter; @@ -55,7 +55,7 @@ public class SysDictController { @Operation(summary = "新增字典", security = {@SecurityRequirement(name = "Authorization")}) @PostMapping @PreAuthorize("@ss.hasPerm('sys:dict:add')") - @Resubmit + @PreventDuplicateSubmit public Result saveDict( @RequestBody DictForm DictForm ) { @@ -117,7 +117,7 @@ public class SysDictController { @Operation(summary = "新增字典类型", security = {@SecurityRequirement(name = "Authorization")}) @PostMapping("/types") @PreAuthorize("@ss.hasPerm('sys:dict_type:add')") - @Resubmit + @PreventDuplicateSubmit public Result saveDictType(@RequestBody DictTypeForm dictTypeForm) { boolean result = dictTypeService.saveDictType(dictTypeForm); return Result.judge(result); diff --git a/src/main/java/com/youlai/system/controller/SysMenuController.java b/src/main/java/com/youlai/system/controller/SysMenuController.java index c463c7e1..16f48c78 100644 --- a/src/main/java/com/youlai/system/controller/SysMenuController.java +++ b/src/main/java/com/youlai/system/controller/SysMenuController.java @@ -1,12 +1,12 @@ package com.youlai.system.controller; import com.youlai.system.common.result.Result; -import com.youlai.system.framework.resubmit.Resubmit; -import com.youlai.system.pojo.form.MenuForm; -import com.youlai.system.pojo.query.MenuQuery; -import com.youlai.system.pojo.vo.MenuVO; -import com.youlai.system.pojo.vo.Option; -import com.youlai.system.pojo.vo.RouteVO; +import com.youlai.system.common.annotation.PreventDuplicateSubmit; +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.service.SysMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -25,7 +25,7 @@ import java.util.List; * 菜单控制器 * * @author haoxr - * @date 2020/11/06 + * @since 2020/11/06 */ @Tag(name = "04.菜单接口") @RestController @@ -69,7 +69,7 @@ public class SysMenuController { @Operation(summary = "新增菜单",security = {@SecurityRequirement(name = "Authorization")}) @PostMapping @PreAuthorize("@ss.hasPerm('sys:menu:add')") - @Resubmit + @PreventDuplicateSubmit @CacheEvict(cacheNames = "system", key = "'routes'") public Result addMenu(@RequestBody MenuForm menuForm) { boolean result = menuService.saveMenu(menuForm); diff --git a/src/main/java/com/youlai/system/controller/SysRoleController.java b/src/main/java/com/youlai/system/controller/SysRoleController.java index 748112f3..5d1c5251 100644 --- a/src/main/java/com/youlai/system/controller/SysRoleController.java +++ b/src/main/java/com/youlai/system/controller/SysRoleController.java @@ -1,13 +1,13 @@ package com.youlai.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.framework.resubmit.Resubmit; -import com.youlai.system.pojo.vo.Option; +import com.youlai.system.common.annotation.PreventDuplicateSubmit; +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.pojo.form.RoleForm; -import com.youlai.system.pojo.query.RolePageQuery; -import com.youlai.system.pojo.vo.RolePageVO; +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.service.SysRoleService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -48,7 +48,7 @@ public class SysRoleController { @Operation(summary = "新增角色",security = {@SecurityRequirement(name = "Authorization")}) @PostMapping @PreAuthorize("@ss.hasPerm('sys:role:add')") - @Resubmit + @PreventDuplicateSubmit 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/system/controller/SysUserController.java index 4e819209..66fda620 100644 --- a/src/main/java/com/youlai/system/controller/SysUserController.java +++ b/src/main/java/com/youlai/system/controller/SysUserController.java @@ -8,15 +8,15 @@ import com.youlai.system.common.constant.ExcelConstants; import com.youlai.system.common.result.PageResult; import com.youlai.system.common.result.Result; import com.youlai.system.common.util.ExcelUtils; -import com.youlai.system.framework.resubmit.Resubmit; -import com.youlai.system.listener.UserImportListener; -import com.youlai.system.pojo.vo.UserImportVO; -import com.youlai.system.pojo.form.UserForm; -import com.youlai.system.pojo.entity.SysUser; -import com.youlai.system.pojo.query.UserPageQuery; -import com.youlai.system.pojo.vo.UserExportVO; -import com.youlai.system.pojo.vo.UserInfoVO; -import com.youlai.system.pojo.vo.UserPageVO; +import com.youlai.system.common.annotation.PreventDuplicateSubmit; +import com.youlai.system.listener.easyexcel.UserImportListener; +import com.youlai.system.model.vo.UserImportVO; +import com.youlai.system.model.form.UserForm; +import com.youlai.system.model.entity.SysUser; +import com.youlai.system.model.query.UserPageQuery; +import com.youlai.system.model.vo.UserExportVO; +import com.youlai.system.model.vo.UserInfoVO; +import com.youlai.system.model.vo.UserPageVO; import com.youlai.system.service.SysUserService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -43,7 +43,7 @@ import java.util.List; * 用户控制器 * * @author haoxr - * @date 2022/10/16 + * @since 2022/10/16 */ @Tag(name = "02.用户接口") @RestController @@ -65,7 +65,7 @@ public class SysUserController { @Operation(summary = "新增用户", security = {@SecurityRequirement(name = "Authorization")}) @PostMapping @PreAuthorize("@ss.hasPerm('sys:user:add')") - @Resubmit + @PreventDuplicateSubmit public Result saveUser( @RequestBody @Valid UserForm userForm ) { diff --git a/src/main/java/com/youlai/system/converter/DeptConverter.java b/src/main/java/com/youlai/system/converter/DeptConverter.java index b9fc360a..585b5c12 100644 --- a/src/main/java/com/youlai/system/converter/DeptConverter.java +++ b/src/main/java/com/youlai/system/converter/DeptConverter.java @@ -1,15 +1,15 @@ package com.youlai.system.converter; -import com.youlai.system.pojo.entity.SysDept; -import com.youlai.system.pojo.form.DeptForm; -import com.youlai.system.pojo.vo.DeptVO; +import com.youlai.system.model.entity.SysDept; +import com.youlai.system.model.form.DeptForm; +import com.youlai.system.model.vo.DeptVO; import org.mapstruct.Mapper; /** * 部门对象转换器 * * @author haoxr - * @date 2022/7/29 + * @since 2022/7/29 */ @Mapper(componentModel = "spring") public interface DeptConverter { diff --git a/src/main/java/com/youlai/system/converter/DictConverter.java b/src/main/java/com/youlai/system/converter/DictConverter.java index 235c6eca..da491799 100644 --- a/src/main/java/com/youlai/system/converter/DictConverter.java +++ b/src/main/java/com/youlai/system/converter/DictConverter.java @@ -1,9 +1,9 @@ package com.youlai.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.pojo.entity.SysDict; -import com.youlai.system.pojo.form.DictForm; -import com.youlai.system.pojo.vo.DictPageVO; +import com.youlai.system.model.entity.SysDict; +import com.youlai.system.model.form.DictForm; +import com.youlai.system.model.vo.DictPageVO; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; @@ -11,7 +11,7 @@ import org.mapstruct.Mapper; * 字典数据项对象转换器 * * @author haoxr - * @date 2022/6/8 + * @since 2022/6/8 */ @Mapper(componentModel = "spring") public interface DictConverter { diff --git a/src/main/java/com/youlai/system/converter/DictTypeConverter.java b/src/main/java/com/youlai/system/converter/DictTypeConverter.java index d87fc22f..792c13ee 100644 --- a/src/main/java/com/youlai/system/converter/DictTypeConverter.java +++ b/src/main/java/com/youlai/system/converter/DictTypeConverter.java @@ -1,16 +1,16 @@ package com.youlai.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.pojo.entity.SysDictType; -import com.youlai.system.pojo.form.DictTypeForm; -import com.youlai.system.pojo.vo.DictTypePageVO; +import com.youlai.system.model.entity.SysDictType; +import com.youlai.system.model.form.DictTypeForm; +import com.youlai.system.model.vo.DictTypePageVO; import org.mapstruct.Mapper; /** * 字典类型对象转换器 * * @author haoxr - * @date 2022/6/8 + * @since 2022/6/8 */ @Mapper(componentModel = "spring") public interface DictTypeConverter { diff --git a/src/main/java/com/youlai/system/converter/MenuConverter.java b/src/main/java/com/youlai/system/converter/MenuConverter.java index b8ca47e5..51a50e25 100644 --- a/src/main/java/com/youlai/system/converter/MenuConverter.java +++ b/src/main/java/com/youlai/system/converter/MenuConverter.java @@ -1,15 +1,15 @@ package com.youlai.system.converter; -import com.youlai.system.pojo.entity.SysMenu; -import com.youlai.system.pojo.form.MenuForm; -import com.youlai.system.pojo.vo.MenuVO; +import com.youlai.system.model.entity.SysMenu; +import com.youlai.system.model.form.MenuForm; +import com.youlai.system.model.vo.MenuVO; import org.mapstruct.Mapper; /** * 菜单对象转换器 * * @author haoxr - * @date 2022/7/29 + * @since 2022/7/29 */ @Mapper(componentModel = "spring") public interface MenuConverter { diff --git a/src/main/java/com/youlai/system/converter/RoleConverter.java b/src/main/java/com/youlai/system/converter/RoleConverter.java index 262fd6d0..620748ac 100644 --- a/src/main/java/com/youlai/system/converter/RoleConverter.java +++ b/src/main/java/com/youlai/system/converter/RoleConverter.java @@ -1,10 +1,10 @@ package com.youlai.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.pojo.vo.Option; -import com.youlai.system.pojo.entity.SysRole; -import com.youlai.system.pojo.form.RoleForm; -import com.youlai.system.pojo.vo.RolePageVO; +import com.youlai.system.common.model.Option; +import com.youlai.system.model.entity.SysRole; +import com.youlai.system.model.form.RoleForm; +import com.youlai.system.model.vo.RolePageVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -15,7 +15,7 @@ import java.util.List; * 角色对象转换器 * * @author haoxr - * @date 2022/5/29 + * @since 2022/5/29 */ @Mapper(componentModel = "spring") public interface RoleConverter { diff --git a/src/main/java/com/youlai/system/converter/UserConverter.java b/src/main/java/com/youlai/system/converter/UserConverter.java index 7dbb7bcb..5880fdcf 100644 --- a/src/main/java/com/youlai/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/system/converter/UserConverter.java @@ -1,13 +1,13 @@ package com.youlai.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.pojo.bo.UserBO; -import com.youlai.system.pojo.entity.SysUser; -import com.youlai.system.pojo.form.UserForm; -import com.youlai.system.pojo.bo.UserFormBO; -import com.youlai.system.pojo.vo.UserImportVO; -import com.youlai.system.pojo.vo.UserInfoVO; -import com.youlai.system.pojo.vo.UserPageVO; +import com.youlai.system.model.bo.UserBO; +import com.youlai.system.model.entity.SysUser; +import com.youlai.system.model.form.UserForm; +import com.youlai.system.model.bo.UserFormBO; +import com.youlai.system.model.vo.UserImportVO; +import com.youlai.system.model.vo.UserInfoVO; +import com.youlai.system.model.vo.UserPageVO; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -17,7 +17,7 @@ import org.mapstruct.Mappings; * 用户对象转换器 * * @author haoxr - * @date 2022/6/8 + * @since 2022/6/8 */ @Mapper(componentModel = "spring") public interface UserConverter { diff --git a/src/main/java/com/youlai/system/framework/security/filter/JwtAuthenticationFilter.java b/src/main/java/com/youlai/system/filter/JwtAuthenticationFilter.java similarity index 95% rename from src/main/java/com/youlai/system/framework/security/filter/JwtAuthenticationFilter.java rename to src/main/java/com/youlai/system/filter/JwtAuthenticationFilter.java index 237c7717..1ee24551 100644 --- a/src/main/java/com/youlai/system/framework/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/youlai/system/filter/JwtAuthenticationFilter.java @@ -1,11 +1,11 @@ -package com.youlai.system.framework.security.filter; +package com.youlai.system.filter; import cn.hutool.core.util.StrUtil; import com.youlai.system.common.constant.SecurityConstants; import com.youlai.system.common.result.ResultCode; import com.youlai.system.common.util.RequestUtils; import com.youlai.system.common.util.ResponseUtils; -import com.youlai.system.framework.security.JwtTokenManager; +import com.youlai.system.security.JwtTokenManager; import io.jsonwebtoken.Claims; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -22,7 +22,7 @@ import java.io.IOException; * JWT 校验过滤器 * * @author haoxr - * @date 2022/10/1 + * @since 2022/10/1 */ public class JwtAuthenticationFilter extends OncePerRequestFilter { diff --git a/src/main/java/com/youlai/system/filter/RequestLogFilter.java b/src/main/java/com/youlai/system/filter/RequestLogFilter.java index a40cb657..0a968789 100644 --- a/src/main/java/com/youlai/system/filter/RequestLogFilter.java +++ b/src/main/java/com/youlai/system/filter/RequestLogFilter.java @@ -8,8 +8,8 @@ import org.springframework.web.filter.CommonsRequestLoggingFilter; /** * 请求日志打印过滤器 * - * @author: haoxr - * @date: 2023/03/03 + * @author haoxr + * @since 2023/03/03 */ @Configuration @Slf4j diff --git a/src/main/java/com/youlai/system/framework/security/filter/VerifyCodeFilter.java b/src/main/java/com/youlai/system/filter/VerifyCodeFilter.java similarity index 97% rename from src/main/java/com/youlai/system/framework/security/filter/VerifyCodeFilter.java rename to src/main/java/com/youlai/system/filter/VerifyCodeFilter.java index 94b885a9..3e6c5fb7 100644 --- a/src/main/java/com/youlai/system/framework/security/filter/VerifyCodeFilter.java +++ b/src/main/java/com/youlai/system/filter/VerifyCodeFilter.java @@ -1,4 +1,4 @@ -package com.youlai.system.framework.security.filter; +package com.youlai.system.filter; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; @@ -21,7 +21,7 @@ import java.io.IOException; * 验证码校验过滤器 * * @author haoxr - * @date 2022/10/1 + * @since 2022/10/1 */ public class VerifyCodeFilter extends OncePerRequestFilter { diff --git a/src/main/java/com/youlai/system/framework/mybatisplus/MyDataPermissionHandler.java b/src/main/java/com/youlai/system/handler/mybatisplus/MyDataPermissionHandler.java similarity index 95% rename from src/main/java/com/youlai/system/framework/mybatisplus/MyDataPermissionHandler.java rename to src/main/java/com/youlai/system/handler/mybatisplus/MyDataPermissionHandler.java index aac22a65..cb22cb64 100644 --- a/src/main/java/com/youlai/system/framework/mybatisplus/MyDataPermissionHandler.java +++ b/src/main/java/com/youlai/system/handler/mybatisplus/MyDataPermissionHandler.java @@ -1,12 +1,13 @@ -package com.youlai.system.framework.mybatisplus; +package com.youlai.system.handler.mybatisplus; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; +import com.youlai.system.common.annotation.DataPermission; import com.youlai.system.common.base.IBaseEnum; import com.youlai.system.common.enums.DataScopeEnum; -import com.youlai.system.framework.security.util.SecurityUtils; +import com.youlai.system.common.util.SecurityUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; @@ -19,7 +20,7 @@ import java.lang.reflect.Method; * 数据权限控制器 * * @author zc - * @date 2021-12-10 13:28 + * @since 2021-12-10 13:28 */ @Slf4j public class MyDataPermissionHandler implements DataPermissionHandler { diff --git a/src/main/java/com/youlai/system/framework/mybatisplus/MyMetaObjectHandler.java b/src/main/java/com/youlai/system/handler/mybatisplus/MyMetaObjectHandler.java similarity index 93% rename from src/main/java/com/youlai/system/framework/mybatisplus/MyMetaObjectHandler.java rename to src/main/java/com/youlai/system/handler/mybatisplus/MyMetaObjectHandler.java index 73c8a6a6..d9790372 100644 --- a/src/main/java/com/youlai/system/framework/mybatisplus/MyMetaObjectHandler.java +++ b/src/main/java/com/youlai/system/handler/mybatisplus/MyMetaObjectHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.framework.mybatisplus; +package com.youlai.system.handler.mybatisplus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * mybatis-plus 字段自动填充 * * @author haoxr - * @date 2022/10/14 + * @since 2022/10/14 * @link https://mp.baomidou.com/guide/auto-fill-metainfo.html */ @Component diff --git a/src/main/java/com/youlai/system/framework/xxljob/XxlJobSampleHandler.java b/src/main/java/com/youlai/system/handler/xxljob/XxlJobSampleHandler.java similarity index 92% rename from src/main/java/com/youlai/system/framework/xxljob/XxlJobSampleHandler.java rename to src/main/java/com/youlai/system/handler/xxljob/XxlJobSampleHandler.java index 95f3ce94..b321ea3a 100644 --- a/src/main/java/com/youlai/system/framework/xxljob/XxlJobSampleHandler.java +++ b/src/main/java/com/youlai/system/handler/xxljob/XxlJobSampleHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.framework.xxljob; +package com.youlai.system.handler.xxljob; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/src/main/java/com/youlai/system/framework/easyexcel/MyAnalysisEventListener.java b/src/main/java/com/youlai/system/listener/easyexcel/MyAnalysisEventListener.java similarity index 74% rename from src/main/java/com/youlai/system/framework/easyexcel/MyAnalysisEventListener.java rename to src/main/java/com/youlai/system/listener/easyexcel/MyAnalysisEventListener.java index 6dec9710..de7eb86e 100644 --- a/src/main/java/com/youlai/system/framework/easyexcel/MyAnalysisEventListener.java +++ b/src/main/java/com/youlai/system/listener/easyexcel/MyAnalysisEventListener.java @@ -1,12 +1,12 @@ -package com.youlai.system.framework.easyexcel; +package com.youlai.system.listener.easyexcel; import com.alibaba.excel.event.AnalysisEventListener; /** * 自定义解析结果监听器 * - * @author: haoxr - * @date: 2023/03/01 + * @author haoxr + * @since 2023/03/01 */ public abstract class MyAnalysisEventListener extends AnalysisEventListener { diff --git a/src/main/java/com/youlai/system/listener/UserImportListener.java b/src/main/java/com/youlai/system/listener/easyexcel/UserImportListener.java similarity index 95% rename from src/main/java/com/youlai/system/listener/UserImportListener.java rename to src/main/java/com/youlai/system/listener/easyexcel/UserImportListener.java index d21ba039..f5efeaab 100644 --- a/src/main/java/com/youlai/system/listener/UserImportListener.java +++ b/src/main/java/com/youlai/system/listener/easyexcel/UserImportListener.java @@ -1,4 +1,4 @@ -package com.youlai.system.listener; +package com.youlai.system.listener.easyexcel; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Validator; @@ -12,11 +12,10 @@ import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.common.enums.GenderEnum; import com.youlai.system.common.enums.StatusEnum; import com.youlai.system.converter.UserConverter; -import com.youlai.system.framework.easyexcel.MyAnalysisEventListener; -import com.youlai.system.pojo.entity.SysRole; -import com.youlai.system.pojo.entity.SysUser; -import com.youlai.system.pojo.entity.SysUserRole; -import com.youlai.system.pojo.vo.UserImportVO; +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.model.vo.UserImportVO; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; import com.youlai.system.service.SysUserService; diff --git a/src/main/java/com/youlai/system/listener/rabbitmq/TestListener.java b/src/main/java/com/youlai/system/listener/rabbitmq/TestListener.java new file mode 100644 index 00000000..9302ddb1 --- /dev/null +++ b/src/main/java/com/youlai/system/listener/rabbitmq/TestListener.java @@ -0,0 +1,8 @@ +package com.youlai.system.listener.rabbitmq; + +/** + * @author haoxr + * @since 0.0.1 + */ +public class TestListener { +} diff --git a/src/main/java/com/youlai/system/mapper/SysDeptMapper.java b/src/main/java/com/youlai/system/mapper/SysDeptMapper.java index b31e6b58..280e78bb 100644 --- a/src/main/java/com/youlai/system/mapper/SysDeptMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysDeptMapper.java @@ -3,8 +3,8 @@ package com.youlai.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.framework.mybatisplus.DataPermission; -import com.youlai.system.pojo.entity.SysDept; +import com.youlai.system.common.annotation.DataPermission; +import com.youlai.system.model.entity.SysDept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/youlai/system/mapper/SysDictMapper.java b/src/main/java/com/youlai/system/mapper/SysDictMapper.java index 888546fe..8fa88a97 100644 --- a/src/main/java/com/youlai/system/mapper/SysDictMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysDictMapper.java @@ -1,7 +1,7 @@ package com.youlai.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.pojo.entity.SysDict; +import com.youlai.system.model.entity.SysDict; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/youlai/system/mapper/SysDictTypeMapper.java b/src/main/java/com/youlai/system/mapper/SysDictTypeMapper.java index d4799b77..6bd1a28a 100644 --- a/src/main/java/com/youlai/system/mapper/SysDictTypeMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysDictTypeMapper.java @@ -1,7 +1,7 @@ package com.youlai.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.pojo.entity.SysDictType; +import com.youlai.system.model.entity.SysDictType; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java b/src/main/java/com/youlai/system/mapper/SysMenuMapper.java index 5ec408d1..302b6d33 100644 --- a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysMenuMapper.java @@ -4,12 +4,12 @@ package com.youlai.system.mapper; * 菜单持久接口层 * * @author haoxr - * @date 2022/1/24 + * @since 2022/1/24 */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.pojo.entity.SysMenu; -import com.youlai.system.pojo.bo.RouteBO; +import com.youlai.system.model.entity.SysMenu; +import com.youlai.system.model.bo.RouteBO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/system/mapper/SysRoleMapper.java b/src/main/java/com/youlai/system/mapper/SysRoleMapper.java index bb107419..fba8f94c 100644 --- a/src/main/java/com/youlai/system/mapper/SysRoleMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ package com.youlai.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.pojo.entity.SysRole; +import com.youlai.system.model.entity.SysRole; import org.apache.ibatis.annotations.Mapper; import java.util.Set; diff --git a/src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java b/src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java index ef28ace3..7bcaf893 100644 --- a/src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ package com.youlai.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.pojo.entity.SysRoleMenu; +import com.youlai.system.model.entity.SysRoleMenu; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,7 +10,7 @@ import java.util.List; * 角色菜单持久层 * * @author haoxr - * @date 2022/6/4 + * @since 2022/6/4 */ @Mapper public interface SysRoleMenuMapper extends BaseMapper { diff --git a/src/main/java/com/youlai/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/system/mapper/SysUserMapper.java index 619b1e1e..05a7b6c7 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysUserMapper.java @@ -2,13 +2,13 @@ package com.youlai.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.framework.mybatisplus.DataPermission; -import com.youlai.system.pojo.bo.UserBO; -import com.youlai.system.pojo.entity.SysUser; -import com.youlai.system.pojo.bo.UserAuthInfo; -import com.youlai.system.pojo.bo.UserFormBO; -import com.youlai.system.pojo.query.UserPageQuery; -import com.youlai.system.pojo.vo.UserExportVO; +import com.youlai.system.common.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.bo.UserFormBO; +import com.youlai.system.model.query.UserPageQuery; +import com.youlai.system.model.vo.UserExportVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; * 用户持久层 * * @author haoxr - * @date 2022/1/14 + * @since 2022/1/14 */ @Mapper public interface SysUserMapper extends BaseMapper { diff --git a/src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java b/src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java index bafd2c9f..cc9cce78 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysUserRoleMapper.java @@ -1,14 +1,14 @@ package com.youlai.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.system.pojo.entity.SysUserRole; +import com.youlai.system.model.entity.SysUserRole; import org.apache.ibatis.annotations.Mapper; /** * 用户角色持久层 * * @author haoxr - * @date 2022/1/15 + * @since 2022/1/15 */ @Mapper public interface SysUserRoleMapper extends BaseMapper { diff --git a/src/main/java/com/youlai/system/pojo/bo/RouteBO.java b/src/main/java/com/youlai/system/model/bo/RouteBO.java similarity index 97% rename from src/main/java/com/youlai/system/pojo/bo/RouteBO.java rename to src/main/java/com/youlai/system/model/bo/RouteBO.java index 5c16ee7d..4f821c71 100644 --- a/src/main/java/com/youlai/system/pojo/bo/RouteBO.java +++ b/src/main/java/com/youlai/system/model/bo/RouteBO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.bo; +package com.youlai.system.model.bo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/youlai/system/pojo/bo/UserBO.java b/src/main/java/com/youlai/system/model/bo/UserBO.java similarity index 94% rename from src/main/java/com/youlai/system/pojo/bo/UserBO.java rename to src/main/java/com/youlai/system/model/bo/UserBO.java index 4933123a..34395570 100644 --- a/src/main/java/com/youlai/system/pojo/bo/UserBO.java +++ b/src/main/java/com/youlai/system/model/bo/UserBO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.bo; +package com.youlai.system.model.bo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -9,7 +9,7 @@ import java.util.Date; * 用户持久化对象 * * @author haoxr - * @date 2022/6/10 + * @since 2022/6/10 */ @Data public class UserBO { diff --git a/src/main/java/com/youlai/system/pojo/bo/UserFormBO.java b/src/main/java/com/youlai/system/model/bo/UserFormBO.java similarity index 93% rename from src/main/java/com/youlai/system/pojo/bo/UserFormBO.java rename to src/main/java/com/youlai/system/model/bo/UserFormBO.java index e342161b..2fd916b0 100644 --- a/src/main/java/com/youlai/system/pojo/bo/UserFormBO.java +++ b/src/main/java/com/youlai/system/model/bo/UserFormBO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.bo; +package com.youlai.system.model.bo; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.List; * user表单持久化对象 * * @author haoxr - * @date 2022/6/10 + * @since 2022/6/10 */ @Data public class UserFormBO { diff --git a/src/main/java/com/youlai/system/pojo/dto/CaptchaResult.java b/src/main/java/com/youlai/system/model/dto/CaptchaResult.java similarity index 84% rename from src/main/java/com/youlai/system/pojo/dto/CaptchaResult.java rename to src/main/java/com/youlai/system/model/dto/CaptchaResult.java index f5c471d3..6c250c7c 100644 --- a/src/main/java/com/youlai/system/pojo/dto/CaptchaResult.java +++ b/src/main/java/com/youlai/system/model/dto/CaptchaResult.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.dto; +package com.youlai.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; @@ -7,8 +7,8 @@ import lombok.Data; /** * 验证码响应对象 * - * @author: haoxr - * @date: 2023/03/24 + * @author haoxr + * @since 2023/03/24 */ @Schema(description ="验证码响应对象") @Builder diff --git a/src/main/java/com/youlai/system/pojo/dto/LoginResult.java b/src/main/java/com/youlai/system/model/dto/LoginResult.java similarity index 93% rename from src/main/java/com/youlai/system/pojo/dto/LoginResult.java rename to src/main/java/com/youlai/system/model/dto/LoginResult.java index b308d1e4..764749b2 100644 --- a/src/main/java/com/youlai/system/pojo/dto/LoginResult.java +++ b/src/main/java/com/youlai/system/model/dto/LoginResult.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.dto; +package com.youlai.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/youlai/system/pojo/bo/UserAuthInfo.java b/src/main/java/com/youlai/system/model/dto/UserAuthInfo.java similarity index 87% rename from src/main/java/com/youlai/system/pojo/bo/UserAuthInfo.java rename to src/main/java/com/youlai/system/model/dto/UserAuthInfo.java index 60b44548..2117ecc1 100644 --- a/src/main/java/com/youlai/system/pojo/bo/UserAuthInfo.java +++ b/src/main/java/com/youlai/system/model/dto/UserAuthInfo.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.bo; +package com.youlai.system.model.dto; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Set; * 用户认证信息 * * @author haoxr - * @date 2022/10/22 + * @since 2022/10/22 * */ @Data diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDept.java b/src/main/java/com/youlai/system/model/entity/SysDept.java similarity index 95% rename from src/main/java/com/youlai/system/pojo/entity/SysDept.java rename to src/main/java/com/youlai/system/model/entity/SysDept.java index 551c5cdb..a29b16bc 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDept.java +++ b/src/main/java/com/youlai/system/model/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.entity; +package com.youlai.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDict.java b/src/main/java/com/youlai/system/model/entity/SysDict.java similarity index 89% rename from src/main/java/com/youlai/system/pojo/entity/SysDict.java rename to src/main/java/com/youlai/system/model/entity/SysDict.java index 17a0e919..557ae449 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDict.java +++ b/src/main/java/com/youlai/system/model/entity/SysDict.java @@ -1,9 +1,9 @@ -package com.youlai.system.pojo.entity; +package com.youlai.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import lombok.Data; @@ -12,7 +12,7 @@ import lombok.Data; * 字典数据表 * * @author haoxr - * @date 2022/12/17 + * @since 2022/12/17 */ @Data public class SysDict implements Serializable { diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDictType.java b/src/main/java/com/youlai/system/model/entity/SysDictType.java similarity index 91% rename from src/main/java/com/youlai/system/pojo/entity/SysDictType.java rename to src/main/java/com/youlai/system/model/entity/SysDictType.java index d3ae1d4d..165ccb1e 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDictType.java +++ b/src/main/java/com/youlai/system/model/entity/SysDictType.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.entity; +package com.youlai.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,7 +9,7 @@ import lombok.Data; * 字典类型实体 * * @author haoxr - * @date 2022/12/17 + * @since 2022/12/17 */ @Data public class SysDictType extends BaseEntity { diff --git a/src/main/java/com/youlai/system/pojo/entity/SysMenu.java b/src/main/java/com/youlai/system/model/entity/SysMenu.java similarity index 95% rename from src/main/java/com/youlai/system/pojo/entity/SysMenu.java rename to src/main/java/com/youlai/system/model/entity/SysMenu.java index 570be33e..4c475060 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysMenu.java +++ b/src/main/java/com/youlai/system/model/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.entity; +package com.youlai.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,7 +12,7 @@ import lombok.Data; * 菜单实体对象 * * @author haoxr - * @date 2023/3/6 + * @since 2023/3/6 */ @TableName(value ="sys_menu") @Data diff --git a/src/main/java/com/youlai/system/pojo/entity/SysRole.java b/src/main/java/com/youlai/system/model/entity/SysRole.java similarity index 95% rename from src/main/java/com/youlai/system/pojo/entity/SysRole.java rename to src/main/java/com/youlai/system/model/entity/SysRole.java index 3ba3a56c..b3292a75 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysRole.java +++ b/src/main/java/com/youlai/system/model/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.entity; +package com.youlai.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java b/src/main/java/com/youlai/system/model/entity/SysRoleMenu.java similarity index 91% rename from src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java rename to src/main/java/com/youlai/system/model/entity/SysRoleMenu.java index 3b664948..59f2d09b 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java +++ b/src/main/java/com/youlai/system/model/entity/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.entity; +package com.youlai.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/youlai/system/pojo/entity/SysUser.java b/src/main/java/com/youlai/system/model/entity/SysUser.java similarity index 96% rename from src/main/java/com/youlai/system/pojo/entity/SysUser.java rename to src/main/java/com/youlai/system/model/entity/SysUser.java index ab801441..78eafc36 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysUser.java +++ b/src/main/java/com/youlai/system/model/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.entity; +package com.youlai.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java b/src/main/java/com/youlai/system/model/entity/SysUserRole.java similarity index 88% rename from src/main/java/com/youlai/system/pojo/entity/SysUserRole.java rename to src/main/java/com/youlai/system/model/entity/SysUserRole.java index ff6def85..11a5a539 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java +++ b/src/main/java/com/youlai/system/model/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.entity; +package com.youlai.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; * 用户和角色关联表 * * @author haoxr - * @date 2022/12/17 + * @since 2022/12/17 */ @Data @AllArgsConstructor diff --git a/src/main/java/com/youlai/system/pojo/form/DeptForm.java b/src/main/java/com/youlai/system/model/form/DeptForm.java similarity index 94% rename from src/main/java/com/youlai/system/pojo/form/DeptForm.java rename to src/main/java/com/youlai/system/model/form/DeptForm.java index 664fec9e..e25c2ca0 100644 --- a/src/main/java/com/youlai/system/pojo/form/DeptForm.java +++ b/src/main/java/com/youlai/system/model/form/DeptForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.form; +package com.youlai.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/pojo/form/DictForm.java b/src/main/java/com/youlai/system/model/form/DictForm.java similarity index 94% rename from src/main/java/com/youlai/system/pojo/form/DictForm.java rename to src/main/java/com/youlai/system/model/form/DictForm.java index 46178647..ad5e4275 100644 --- a/src/main/java/com/youlai/system/pojo/form/DictForm.java +++ b/src/main/java/com/youlai/system/model/form/DictForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.form; +package com.youlai.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/pojo/form/DictTypeForm.java b/src/main/java/com/youlai/system/model/form/DictTypeForm.java similarity index 92% rename from src/main/java/com/youlai/system/pojo/form/DictTypeForm.java rename to src/main/java/com/youlai/system/model/form/DictTypeForm.java index 98293c69..9ee3233d 100644 --- a/src/main/java/com/youlai/system/pojo/form/DictTypeForm.java +++ b/src/main/java/com/youlai/system/model/form/DictTypeForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.form; +package com.youlai.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/pojo/form/MenuForm.java b/src/main/java/com/youlai/system/model/form/MenuForm.java similarity index 96% rename from src/main/java/com/youlai/system/pojo/form/MenuForm.java rename to src/main/java/com/youlai/system/model/form/MenuForm.java index a2a23b51..ca4a6904 100644 --- a/src/main/java/com/youlai/system/pojo/form/MenuForm.java +++ b/src/main/java/com/youlai/system/model/form/MenuForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.form; +package com.youlai.system.model.form; import com.youlai.system.common.enums.MenuTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/pojo/form/RoleForm.java b/src/main/java/com/youlai/system/model/form/RoleForm.java similarity index 95% rename from src/main/java/com/youlai/system/pojo/form/RoleForm.java rename to src/main/java/com/youlai/system/model/form/RoleForm.java index 3df8202a..1fca4418 100644 --- a/src/main/java/com/youlai/system/pojo/form/RoleForm.java +++ b/src/main/java/com/youlai/system/model/form/RoleForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.form; +package com.youlai.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/pojo/form/UserForm.java b/src/main/java/com/youlai/system/model/form/UserForm.java similarity index 95% rename from src/main/java/com/youlai/system/pojo/form/UserForm.java rename to src/main/java/com/youlai/system/model/form/UserForm.java index bcabee0e..a7a29087 100644 --- a/src/main/java/com/youlai/system/pojo/form/UserForm.java +++ b/src/main/java/com/youlai/system/model/form/UserForm.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.form; +package com.youlai.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.List; * 用户表单对象 * * @author haoxr - * @date 2022/4/12 11:04 + * @since 2022/4/12 11:04 */ @Schema(description = "用户表单对象") @Data diff --git a/src/main/java/com/youlai/system/pojo/query/DeptQuery.java b/src/main/java/com/youlai/system/model/query/DeptQuery.java similarity index 77% rename from src/main/java/com/youlai/system/pojo/query/DeptQuery.java rename to src/main/java/com/youlai/system/model/query/DeptQuery.java index 3c2a9576..b12215c3 100644 --- a/src/main/java/com/youlai/system/pojo/query/DeptQuery.java +++ b/src/main/java/com/youlai/system/model/query/DeptQuery.java @@ -1,6 +1,5 @@ -package com.youlai.system.pojo.query; +package com.youlai.system.model.query; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -8,7 +7,7 @@ import lombok.Data; * 部门查询对象 * * @author haoxr - * @date 2022/6/11 + * @since 2022/6/11 */ @Schema(description ="部门分页查询对象") @Data diff --git a/src/main/java/com/youlai/system/pojo/query/DictPageQuery.java b/src/main/java/com/youlai/system/model/query/DictPageQuery.java similarity index 91% rename from src/main/java/com/youlai/system/pojo/query/DictPageQuery.java rename to src/main/java/com/youlai/system/model/query/DictPageQuery.java index 32e4601a..bf41f9cf 100644 --- a/src/main/java/com/youlai/system/pojo/query/DictPageQuery.java +++ b/src/main/java/com/youlai/system/model/query/DictPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.query; +package com.youlai.system.model.query; import com.youlai.system.common.base.BasePageQuery; diff --git a/src/main/java/com/youlai/system/pojo/query/DictTypePageQuery.java b/src/main/java/com/youlai/system/model/query/DictTypePageQuery.java similarity index 79% rename from src/main/java/com/youlai/system/pojo/query/DictTypePageQuery.java rename to src/main/java/com/youlai/system/model/query/DictTypePageQuery.java index 12dab815..9617b521 100644 --- a/src/main/java/com/youlai/system/pojo/query/DictTypePageQuery.java +++ b/src/main/java/com/youlai/system/model/query/DictTypePageQuery.java @@ -1,9 +1,8 @@ -package com.youlai.system.pojo.query; +package com.youlai.system.model.query; import com.youlai.system.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Schema(description ="字典类型分页查询对象") diff --git a/src/main/java/com/youlai/system/pojo/query/MenuQuery.java b/src/main/java/com/youlai/system/model/query/MenuQuery.java similarity index 81% rename from src/main/java/com/youlai/system/pojo/query/MenuQuery.java rename to src/main/java/com/youlai/system/model/query/MenuQuery.java index d37bb40e..7967931e 100644 --- a/src/main/java/com/youlai/system/pojo/query/MenuQuery.java +++ b/src/main/java/com/youlai/system/model/query/MenuQuery.java @@ -1,6 +1,5 @@ -package com.youlai.system.pojo.query; +package com.youlai.system.model.query; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/pojo/query/PermPageQuery.java b/src/main/java/com/youlai/system/model/query/PermPageQuery.java similarity index 76% rename from src/main/java/com/youlai/system/pojo/query/PermPageQuery.java rename to src/main/java/com/youlai/system/model/query/PermPageQuery.java index af735b80..a497f0ce 100644 --- a/src/main/java/com/youlai/system/pojo/query/PermPageQuery.java +++ b/src/main/java/com/youlai/system/model/query/PermPageQuery.java @@ -1,15 +1,14 @@ -package com.youlai.system.pojo.query; +package com.youlai.system.model.query; import com.youlai.system.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** * 权限分页查询对象 * * @author haoxr - * @date 2022/1/14 22:22 + * @since 2022/1/14 22:22 */ @Data @Schema diff --git a/src/main/java/com/youlai/system/pojo/query/RolePageQuery.java b/src/main/java/com/youlai/system/model/query/RolePageQuery.java similarity index 85% rename from src/main/java/com/youlai/system/pojo/query/RolePageQuery.java rename to src/main/java/com/youlai/system/model/query/RolePageQuery.java index 5e2536c6..0a0b6164 100644 --- a/src/main/java/com/youlai/system/pojo/query/RolePageQuery.java +++ b/src/main/java/com/youlai/system/model/query/RolePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.query; +package com.youlai.system.model.query; import com.youlai.system.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,7 +8,7 @@ import lombok.Data; * 角色分页查询实体 * * @author haoxr - * @date 2022/6/3 + * @since 2022/6/3 * */ @Data diff --git a/src/main/java/com/youlai/system/pojo/query/UserPageQuery.java b/src/main/java/com/youlai/system/model/query/UserPageQuery.java similarity index 81% rename from src/main/java/com/youlai/system/pojo/query/UserPageQuery.java rename to src/main/java/com/youlai/system/model/query/UserPageQuery.java index c283b635..88b907f9 100644 --- a/src/main/java/com/youlai/system/pojo/query/UserPageQuery.java +++ b/src/main/java/com/youlai/system/model/query/UserPageQuery.java @@ -1,15 +1,14 @@ -package com.youlai.system.pojo.query; +package com.youlai.system.model.query; import com.youlai.system.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** * 用户分页查询对象 * * @author haoxr - * @date 2022/1/14 + * @since 2022/1/14 */ @Schema @Data diff --git a/src/main/java/com/youlai/system/pojo/vo/DeptVO.java b/src/main/java/com/youlai/system/model/vo/DeptVO.java similarity index 96% rename from src/main/java/com/youlai/system/pojo/vo/DeptVO.java rename to src/main/java/com/youlai/system/model/vo/DeptVO.java index be61c7d3..de2dca16 100644 --- a/src/main/java/com/youlai/system/pojo/vo/DeptVO.java +++ b/src/main/java/com/youlai/system/model/vo/DeptVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.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/pojo/vo/DictPageVO.java b/src/main/java/com/youlai/system/model/vo/DictPageVO.java similarity index 92% rename from src/main/java/com/youlai/system/pojo/vo/DictPageVO.java rename to src/main/java/com/youlai/system/model/vo/DictPageVO.java index f1b94253..ba69553a 100644 --- a/src/main/java/com/youlai/system/pojo/vo/DictPageVO.java +++ b/src/main/java/com/youlai/system/model/vo/DictPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/system/pojo/vo/DictTypePageVO.java b/src/main/java/com/youlai/system/model/vo/DictTypePageVO.java similarity index 83% rename from src/main/java/com/youlai/system/pojo/vo/DictTypePageVO.java rename to src/main/java/com/youlai/system/model/vo/DictTypePageVO.java index 77945f0b..a6419988 100644 --- a/src/main/java/com/youlai/system/pojo/vo/DictTypePageVO.java +++ b/src/main/java/com/youlai/system/model/vo/DictTypePageVO.java @@ -1,7 +1,6 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.model.vo; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/system/pojo/vo/MenuVO.java b/src/main/java/com/youlai/system/model/vo/MenuVO.java similarity index 97% rename from src/main/java/com/youlai/system/pojo/vo/MenuVO.java rename to src/main/java/com/youlai/system/model/vo/MenuVO.java index a2b40fa8..3490e2f7 100644 --- a/src/main/java/com/youlai/system/pojo/vo/MenuVO.java +++ b/src/main/java/com/youlai/system/model/vo/MenuVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.model.vo; import com.fasterxml.jackson.annotation.JsonInclude; import com.youlai.system.common.enums.MenuTypeEnum; diff --git a/src/main/java/com/youlai/system/pojo/vo/RolePageVO.java b/src/main/java/com/youlai/system/model/vo/RolePageVO.java similarity index 95% rename from src/main/java/com/youlai/system/pojo/vo/RolePageVO.java rename to src/main/java/com/youlai/system/model/vo/RolePageVO.java index 6947be58..fc06a1db 100644 --- a/src/main/java/com/youlai/system/pojo/vo/RolePageVO.java +++ b/src/main/java/com/youlai/system/model/vo/RolePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.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/pojo/vo/RouteVO.java b/src/main/java/com/youlai/system/model/vo/RouteVO.java similarity index 96% rename from src/main/java/com/youlai/system/pojo/vo/RouteVO.java rename to src/main/java/com/youlai/system/model/vo/RouteVO.java index d7956f98..283a54ce 100644 --- a/src/main/java/com/youlai/system/pojo/vo/RouteVO.java +++ b/src/main/java/com/youlai/system/model/vo/RouteVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.model.vo; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; @@ -10,7 +10,7 @@ import java.util.List; * 菜单路由视图对象 * * @author haoxr - * @date 2020/11/28 + * @since 2020/11/28 */ @Schema(description = "路由对象") @Data diff --git a/src/main/java/com/youlai/system/pojo/vo/UserExportVO.java b/src/main/java/com/youlai/system/model/vo/UserExportVO.java similarity index 93% rename from src/main/java/com/youlai/system/pojo/vo/UserExportVO.java rename to src/main/java/com/youlai/system/model/vo/UserExportVO.java index bb7cf94c..561dff60 100644 --- a/src/main/java/com/youlai/system/pojo/vo/UserExportVO.java +++ b/src/main/java/com/youlai/system/model/vo/UserExportVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.model.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * 用户导出视图对象 * * @author haoxr - * @date 2022/4/11 8:46 + * @since 2022/4/11 8:46 */ @Data diff --git a/src/main/java/com/youlai/system/pojo/vo/UserImportVO.java b/src/main/java/com/youlai/system/model/vo/UserImportVO.java similarity index 90% rename from src/main/java/com/youlai/system/pojo/vo/UserImportVO.java rename to src/main/java/com/youlai/system/model/vo/UserImportVO.java index 67c27f69..228e6cab 100644 --- a/src/main/java/com/youlai/system/pojo/vo/UserImportVO.java +++ b/src/main/java/com/youlai/system/model/vo/UserImportVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.model.vo; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -7,7 +7,7 @@ import lombok.Data; * 用户导入对象 * * @author haoxr - * @date 2022/4/10 + * @since 2022/4/10 */ @Data public class UserImportVO { diff --git a/src/main/java/com/youlai/system/pojo/vo/UserInfoVO.java b/src/main/java/com/youlai/system/model/vo/UserInfoVO.java similarity index 91% rename from src/main/java/com/youlai/system/pojo/vo/UserInfoVO.java rename to src/main/java/com/youlai/system/model/vo/UserInfoVO.java index 73a643a5..41ed88e1 100644 --- a/src/main/java/com/youlai/system/pojo/vo/UserInfoVO.java +++ b/src/main/java/com/youlai/system/model/vo/UserInfoVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -9,7 +9,7 @@ import java.util.Set; * 用户登录视图对象 * * @author haoxr - * @date 2022/1/14 + * @since 2022/1/14 */ @Schema(description ="当前登录用户视图对象") @Data diff --git a/src/main/java/com/youlai/system/pojo/vo/UserPageVO.java b/src/main/java/com/youlai/system/model/vo/UserPageVO.java similarity index 94% rename from src/main/java/com/youlai/system/pojo/vo/UserPageVO.java rename to src/main/java/com/youlai/system/model/vo/UserPageVO.java index 6acb9f57..b2d0aa2a 100644 --- a/src/main/java/com/youlai/system/pojo/vo/UserPageVO.java +++ b/src/main/java/com/youlai/system/model/vo/UserPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.system.pojo.vo; +package com.youlai.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -10,7 +10,7 @@ import java.util.Date; * 用户分页视图对象 * * @author haoxr - * @date 2022/1/15 9:41 + * @since 2022/1/15 9:41 */ @Schema(description ="用户分页对象") @Data diff --git a/src/main/java/com/youlai/system/framework/security/JwtTokenManager.java b/src/main/java/com/youlai/system/security/JwtTokenManager.java similarity index 97% rename from src/main/java/com/youlai/system/framework/security/JwtTokenManager.java rename to src/main/java/com/youlai/system/security/JwtTokenManager.java index 8df1507f..fc8bb605 100644 --- a/src/main/java/com/youlai/system/framework/security/JwtTokenManager.java +++ b/src/main/java/com/youlai/system/security/JwtTokenManager.java @@ -1,9 +1,9 @@ -package com.youlai.system.framework.security; +package com.youlai.system.security; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.framework.security.userdetails.SysUserDetails; +import com.youlai.system.security.userdetails.SysUserDetails; import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.io.DecodingException; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; * JWT token manager * * @author haoxr - * @date 2022/10/22 + * @since 2022/10/22 */ @Component public class JwtTokenManager { diff --git a/src/main/java/com/youlai/system/framework/easycaptcha/producer/EasyCaptchaProducer.java b/src/main/java/com/youlai/system/security/captcha/EasyCaptchaProducer.java similarity index 69% rename from src/main/java/com/youlai/system/framework/easycaptcha/producer/EasyCaptchaProducer.java rename to src/main/java/com/youlai/system/security/captcha/EasyCaptchaProducer.java index 3fb4ad27..b70feb57 100644 --- a/src/main/java/com/youlai/system/framework/easycaptcha/producer/EasyCaptchaProducer.java +++ b/src/main/java/com/youlai/system/security/captcha/EasyCaptchaProducer.java @@ -1,8 +1,8 @@ -package com.youlai.system.framework.easycaptcha.producer; +package com.youlai.system.security.captcha; import com.wf.captcha.*; import com.wf.captcha.base.Captcha; -import com.youlai.system.framework.easycaptcha.config.EasyCaptchaConfig; +import com.youlai.system.config.CaptchaConfig; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -11,23 +11,23 @@ import java.awt.*; /** * 验证码生成器 * - * @author: haoxr - * @date: 2023/03/24 + * @author haoxr + * @since 2023/03/24 */ @Component @RequiredArgsConstructor public class EasyCaptchaProducer { - private final EasyCaptchaConfig easyCaptchaConfig; + private final CaptchaConfig captchaConfig; public Captcha getCaptcha() { Captcha captcha; - int width = easyCaptchaConfig.getWidth(); - int height = easyCaptchaConfig.getHeight(); - int length = easyCaptchaConfig.getLength(); - String fontName = easyCaptchaConfig.getFontName(); + int width = captchaConfig.getWidth(); + int height = captchaConfig.getHeight(); + int length = captchaConfig.getLength(); + String fontName = captchaConfig.getFontName(); - switch (easyCaptchaConfig.getType()) { + switch (captchaConfig.getType()) { case ARITHMETIC: captcha = new ArithmeticCaptcha(width, height); //固定设置为两位，图片为算数运算表达式 @@ -52,7 +52,7 @@ public class EasyCaptchaProducer { default: throw new RuntimeException("验证码配置信息错误！正确配置查看 CaptchaTypeEnum "); } - captcha.setFont(new Font(fontName, easyCaptchaConfig.getFontStyle(), easyCaptchaConfig.getFontSize())); + captcha.setFont(new Font(fontName, captchaConfig.getFontStyle(), captchaConfig.getFontSize())); return captcha; } diff --git a/src/main/java/com/youlai/system/framework/easycaptcha/service/EasyCaptchaService.java b/src/main/java/com/youlai/system/security/captcha/EasyCaptchaService.java similarity index 67% rename from src/main/java/com/youlai/system/framework/easycaptcha/service/EasyCaptchaService.java rename to src/main/java/com/youlai/system/security/captcha/EasyCaptchaService.java index 44318326..752e76f0 100644 --- a/src/main/java/com/youlai/system/framework/easycaptcha/service/EasyCaptchaService.java +++ b/src/main/java/com/youlai/system/security/captcha/EasyCaptchaService.java @@ -1,24 +1,23 @@ -package com.youlai.system.framework.easycaptcha.service; +package com.youlai.system.security.captcha; import cn.hutool.core.util.IdUtil; import com.wf.captcha.base.Captcha; import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.framework.easycaptcha.config.EasyCaptchaConfig; -import com.youlai.system.framework.easycaptcha.producer.EasyCaptchaProducer; -import com.youlai.system.pojo.dto.CaptchaResult; +import com.youlai.system.config.CaptchaConfig; +import com.youlai.system.model.dto.CaptchaResult; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Component; import java.util.concurrent.TimeUnit; /** * EasyCaptcha 业务类 * - * @author: haoxr - * @date: 2023/03/24 + * @author haoxr + * @since 2023/03/24 */ -@Service +@Component @RequiredArgsConstructor public class EasyCaptchaService { @@ -26,7 +25,7 @@ public class EasyCaptchaService { private final RedisTemplate redisTemplate; - private final EasyCaptchaConfig easyCaptchaConfig; + private final CaptchaConfig captchaConfig; /** * 获取验证码 @@ -42,13 +41,12 @@ public class EasyCaptchaService { // 验证码文本缓存至Redis，用于登录校验 String verifyCodeKey = IdUtil.fastSimpleUUID(); redisTemplate.opsForValue().set(SecurityConstants.VERIFY_CODE_CACHE_PREFIX + verifyCodeKey, captchaText, - easyCaptchaConfig.getTtl(), TimeUnit.SECONDS); + captchaConfig.getTtl(), TimeUnit.SECONDS); - CaptchaResult captchaResult = CaptchaResult.builder() + return CaptchaResult.builder() .verifyCodeKey(verifyCodeKey) .verifyCodeBase64(captchaBase64) .build(); - return captchaResult; } } diff --git a/src/main/java/com/youlai/system/framework/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java similarity index 91% rename from src/main/java/com/youlai/system/framework/security/exception/MyAccessDeniedHandler.java rename to src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java index 39640537..83515d17 100644 --- a/src/main/java/com/youlai/system/framework/security/exception/MyAccessDeniedHandler.java +++ b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package com.youlai.system.framework.security.exception; +package com.youlai.system.security.exception; import com.youlai.system.common.result.ResultCode; import com.youlai.system.common.util.ResponseUtils; @@ -14,7 +14,7 @@ import java.io.IOException; * Spring Security访问异常处理器 * * @author haoxr - * @date 2022/10/18 + * @since 2022/10/18 */ @Component public class MyAccessDeniedHandler implements AccessDeniedHandler { diff --git a/src/main/java/com/youlai/system/framework/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java similarity index 91% rename from src/main/java/com/youlai/system/framework/security/exception/MyAuthenticationEntryPoint.java rename to src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java index 5b99e766..8c007312 100644 --- a/src/main/java/com/youlai/system/framework/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.youlai.system.framework.security.exception; +package com.youlai.system.security.exception; import com.youlai.system.common.result.ResultCode; import com.youlai.system.common.util.ResponseUtils; @@ -15,7 +15,7 @@ import java.io.IOException; * 认证异常处理 * * @author haoxr - * @date 2022/10/18 + * @since 2022/10/18 */ @Component public class MyAuthenticationEntryPoint implements AuthenticationEntryPoint { diff --git a/src/main/java/com/youlai/system/framework/security/service/PermissionService.java b/src/main/java/com/youlai/system/security/service/PermissionService.java similarity index 88% rename from src/main/java/com/youlai/system/framework/security/service/PermissionService.java rename to src/main/java/com/youlai/system/security/service/PermissionService.java index d32a2a8b..072119b7 100644 --- a/src/main/java/com/youlai/system/framework/security/service/PermissionService.java +++ b/src/main/java/com/youlai/system/security/service/PermissionService.java @@ -1,24 +1,25 @@ -package com.youlai.system.framework.security.service; +package com.youlai.system.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.framework.security.util.SecurityUtils; +import com.youlai.system.common.util.SecurityUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.springframework.util.PatternMatchUtils; import java.util.Set; /** - * SpringSecurity权限校验 + * SpringSecurity 权限校验 * * @author haoxr * @since 2022/2/22 */ -@Service("ss") +@Component("ss") @RequiredArgsConstructor @Slf4j public class PermissionService { diff --git a/src/main/java/com/youlai/system/framework/security/userdetails/SysUserDetails.java b/src/main/java/com/youlai/system/security/userdetails/SysUserDetails.java similarity index 95% rename from src/main/java/com/youlai/system/framework/security/userdetails/SysUserDetails.java rename to src/main/java/com/youlai/system/security/userdetails/SysUserDetails.java index 246f1f94..bc32ccdc 100644 --- a/src/main/java/com/youlai/system/framework/security/userdetails/SysUserDetails.java +++ b/src/main/java/com/youlai/system/security/userdetails/SysUserDetails.java @@ -1,8 +1,8 @@ -package com.youlai.system.framework.security.userdetails; +package com.youlai.system.security.userdetails; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import com.youlai.system.pojo.bo.UserAuthInfo; +import com.youlai.system.model.dto.UserAuthInfo; import lombok.Data; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/com/youlai/system/framework/security/userdetails/SysUserDetailsService.java b/src/main/java/com/youlai/system/security/userdetails/SysUserDetailsService.java similarity index 86% rename from src/main/java/com/youlai/system/framework/security/userdetails/SysUserDetailsService.java rename to src/main/java/com/youlai/system/security/userdetails/SysUserDetailsService.java index c753a467..fe735a2f 100644 --- a/src/main/java/com/youlai/system/framework/security/userdetails/SysUserDetailsService.java +++ b/src/main/java/com/youlai/system/security/userdetails/SysUserDetailsService.java @@ -1,6 +1,6 @@ -package com.youlai.system.framework.security.userdetails; +package com.youlai.system.security.userdetails; -import com.youlai.system.pojo.bo.UserAuthInfo; +import com.youlai.system.model.dto.UserAuthInfo; import com.youlai.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; @@ -9,7 +9,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; /** - * 用户认证信息实现类 + * 系统用户认证 * * @author haoxr */ diff --git a/src/main/java/com/youlai/system/service/SysDeptService.java b/src/main/java/com/youlai/system/service/SysDeptService.java index 28b13249..70de00f2 100644 --- a/src/main/java/com/youlai/system/service/SysDeptService.java +++ b/src/main/java/com/youlai/system/service/SysDeptService.java @@ -1,11 +1,11 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.pojo.vo.Option; -import com.youlai.system.pojo.entity.SysDept; -import com.youlai.system.pojo.form.DeptForm; -import com.youlai.system.pojo.query.DeptQuery; -import com.youlai.system.pojo.vo.DeptVO; +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 java.util.List; @@ -13,7 +13,7 @@ import java.util.List; * 部门业务接口 * * @author haoxr - * @date 2021/8/22 + * @since 2021/8/22 */ public interface SysDeptService extends IService { /** diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/system/service/SysDictService.java index e7671c9a..389f6a91 100644 --- a/src/main/java/com/youlai/system/service/SysDictService.java +++ b/src/main/java/com/youlai/system/service/SysDictService.java @@ -2,11 +2,11 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.pojo.entity.SysDict; -import com.youlai.system.pojo.form.DictForm; -import com.youlai.system.pojo.query.DictPageQuery; -import com.youlai.system.pojo.vo.DictPageVO; -import com.youlai.system.pojo.vo.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.system.common.model.Option; import java.util.List; @@ -14,7 +14,7 @@ import java.util.List; * 字典接口 * * @author haoxr - * @date 2023/3/4 + * @since 2023/3/4 */ public interface SysDictService extends IService { /** diff --git a/src/main/java/com/youlai/system/service/SysDictTypeService.java b/src/main/java/com/youlai/system/service/SysDictTypeService.java index 766cbc69..08a28488 100644 --- a/src/main/java/com/youlai/system/service/SysDictTypeService.java +++ b/src/main/java/com/youlai/system/service/SysDictTypeService.java @@ -2,11 +2,11 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.pojo.vo.Option; -import com.youlai.system.pojo.entity.SysDictType; -import com.youlai.system.pojo.form.DictTypeForm; -import com.youlai.system.pojo.query.DictTypePageQuery; -import com.youlai.system.pojo.vo.DictTypePageVO; +import com.youlai.system.common.model.Option; +import com.youlai.system.model.entity.SysDictType; +import com.youlai.system.model.form.DictTypeForm; +import com.youlai.system.model.query.DictTypePageQuery; +import com.youlai.system.model.vo.DictTypePageVO; import java.util.List; @@ -14,7 +14,7 @@ import java.util.List; * 数据字典类型业务接口 * * @author haoxr - * @date 2022/10/12 + * @since 2022/10/12 */ public interface SysDictTypeService extends IService { diff --git a/src/main/java/com/youlai/system/service/SysMenuService.java b/src/main/java/com/youlai/system/service/SysMenuService.java index d6d7294b..573ac9e6 100644 --- a/src/main/java/com/youlai/system/service/SysMenuService.java +++ b/src/main/java/com/youlai/system/service/SysMenuService.java @@ -1,12 +1,12 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.pojo.form.MenuForm; -import com.youlai.system.pojo.vo.Option; -import com.youlai.system.pojo.entity.SysMenu; -import com.youlai.system.pojo.query.MenuQuery; -import com.youlai.system.pojo.vo.MenuVO; -import com.youlai.system.pojo.vo.RouteVO; +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 java.util.List; import java.util.Set; @@ -15,7 +15,7 @@ import java.util.Set; * 菜单业务接口 * * @author haoxr - * @date 2020/11/06 + * @since 2020/11/06 */ public interface SysMenuService extends IService { diff --git a/src/main/java/com/youlai/system/service/SysRoleMenuService.java b/src/main/java/com/youlai/system/service/SysRoleMenuService.java index 0283a8f6..d4fb25f5 100644 --- a/src/main/java/com/youlai/system/service/SysRoleMenuService.java +++ b/src/main/java/com/youlai/system/service/SysRoleMenuService.java @@ -2,7 +2,7 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.pojo.entity.SysRoleMenu; +import com.youlai.system.model.entity.SysRoleMenu; import java.util.List; diff --git a/src/main/java/com/youlai/system/service/SysRoleService.java b/src/main/java/com/youlai/system/service/SysRoleService.java index 5e410594..e7983264 100644 --- a/src/main/java/com/youlai/system/service/SysRoleService.java +++ b/src/main/java/com/youlai/system/service/SysRoleService.java @@ -3,11 +3,11 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.pojo.vo.Option; -import com.youlai.system.pojo.entity.SysRole; -import com.youlai.system.pojo.form.RoleForm; -import com.youlai.system.pojo.query.RolePageQuery; -import com.youlai.system.pojo.vo.RolePageVO; +import com.youlai.system.common.model.Option; +import com.youlai.system.model.entity.SysRole; +import com.youlai.system.model.form.RoleForm; +import com.youlai.system.model.query.RolePageQuery; +import com.youlai.system.model.vo.RolePageVO; import java.util.List; import java.util.Set; @@ -16,7 +16,7 @@ import java.util.Set; * 角色业务接口层 * * @author haoxr - * @date 2022/6/3 + * @since 2022/6/3 */ public interface SysRoleService extends IService { diff --git a/src/main/java/com/youlai/system/service/SysUserRoleService.java b/src/main/java/com/youlai/system/service/SysUserRoleService.java index 7d2dc8fc..b54218bb 100644 --- a/src/main/java/com/youlai/system/service/SysUserRoleService.java +++ b/src/main/java/com/youlai/system/service/SysUserRoleService.java @@ -2,7 +2,7 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.pojo.entity.SysUserRole; +import com.youlai.system.model.entity.SysUserRole; import java.util.List; diff --git a/src/main/java/com/youlai/system/service/SysUserService.java b/src/main/java/com/youlai/system/service/SysUserService.java index 5731d3b2..7dca75f0 100644 --- a/src/main/java/com/youlai/system/service/SysUserService.java +++ b/src/main/java/com/youlai/system/service/SysUserService.java @@ -3,23 +3,21 @@ package com.youlai.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.pojo.vo.UserImportVO; -import com.youlai.system.pojo.entity.SysUser; -import com.youlai.system.pojo.form.UserForm; -import com.youlai.system.pojo.bo.UserAuthInfo; -import com.youlai.system.pojo.query.UserPageQuery; -import com.youlai.system.pojo.vo.UserExportVO; -import com.youlai.system.pojo.vo.UserInfoVO; -import com.youlai.system.pojo.vo.UserPageVO; +import com.youlai.system.model.entity.SysUser; +import com.youlai.system.model.form.UserForm; +import com.youlai.system.model.dto.UserAuthInfo; +import com.youlai.system.model.query.UserPageQuery; +import com.youlai.system.model.vo.UserExportVO; +import com.youlai.system.model.vo.UserInfoVO; +import com.youlai.system.model.vo.UserPageVO; -import java.io.IOException; import java.util.List; /** * 用户业务接口 * * @author haoxr - * @date 2022/1/14 + * @since 2022/1/14 */ public interface SysUserService extends IService { diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java index a21d55cc..59a02123 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java @@ -8,11 +8,11 @@ import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.common.enums.StatusEnum; import com.youlai.system.converter.DeptConverter; import com.youlai.system.mapper.SysDeptMapper; -import com.youlai.system.pojo.entity.SysDept; -import com.youlai.system.pojo.form.DeptForm; -import com.youlai.system.pojo.query.DeptQuery; -import com.youlai.system.pojo.vo.DeptVO; -import com.youlai.system.pojo.vo.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.system.common.model.Option; import com.youlai.system.service.SysDeptService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * 部门业务实现类 * * @author haoxr - * @date 2021-08-22 + * @since 2021-08-22 */ @Service @RequiredArgsConstructor diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java index 6116ad00..0c61add0 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java @@ -8,11 +8,11 @@ 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.mapper.SysDictMapper; -import com.youlai.system.pojo.entity.SysDict; -import com.youlai.system.pojo.form.DictForm; -import com.youlai.system.pojo.query.DictPageQuery; -import com.youlai.system.pojo.vo.DictPageVO; -import com.youlai.system.pojo.vo.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.system.common.model.Option; import com.youlai.system.service.SysDictService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * 数据字典项业务实现类 * * @author haoxr - * @date 2022/10/12 + * @since 2022/10/12 */ @Service @RequiredArgsConstructor diff --git a/src/main/java/com/youlai/system/service/impl/SysDictTypeServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictTypeServiceImpl.java index c83064e0..29394187 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDictTypeServiceImpl.java @@ -7,14 +7,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.system.pojo.entity.SysDict; -import com.youlai.system.pojo.vo.Option; +import com.youlai.system.model.entity.SysDict; +import com.youlai.system.common.model.Option; import com.youlai.system.converter.DictTypeConverter; import com.youlai.system.mapper.SysDictTypeMapper; -import com.youlai.system.pojo.entity.SysDictType; -import com.youlai.system.pojo.form.DictTypeForm; -import com.youlai.system.pojo.query.DictTypePageQuery; -import com.youlai.system.pojo.vo.DictTypePageVO; +import com.youlai.system.model.entity.SysDictType; +import com.youlai.system.model.form.DictTypeForm; +import com.youlai.system.model.query.DictTypePageQuery; +import com.youlai.system.model.vo.DictTypePageVO; import com.youlai.system.service.SysDictService; import com.youlai.system.service.SysDictTypeService; import lombok.RequiredArgsConstructor; @@ -29,7 +29,7 @@ import java.util.stream.Collectors; * 数据字典类型业务实现类 * * @author haoxr - * @date 2022/10/12 + * @since 2022/10/12 */ @Service @RequiredArgsConstructor diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java index 87b63034..b9c870a0 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java @@ -11,13 +11,13 @@ import com.youlai.system.common.enums.MenuTypeEnum; import com.youlai.system.common.enums.StatusEnum; import com.youlai.system.converter.MenuConverter; import com.youlai.system.mapper.SysMenuMapper; -import com.youlai.system.pojo.bo.RouteBO; -import com.youlai.system.pojo.entity.SysMenu; -import com.youlai.system.pojo.form.MenuForm; -import com.youlai.system.pojo.query.MenuQuery; -import com.youlai.system.pojo.vo.MenuVO; -import com.youlai.system.pojo.vo.Option; -import com.youlai.system.pojo.vo.RouteVO; +import com.youlai.system.model.bo.RouteBO; +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.common.model.Option; +import com.youlai.system.model.vo.RouteVO; import com.youlai.system.service.SysMenuService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * 菜单业务实现类 * * @author haoxr - * @date 2020/11/06 + * @since 2020/11/06 */ @Service @RequiredArgsConstructor diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleMenuServiceImpl.java index 3de20313..d709671b 100644 --- a/src/main/java/com/youlai/system/service/impl/SysRoleMenuServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysRoleMenuServiceImpl.java @@ -2,7 +2,7 @@ package com.youlai.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.mapper.SysRoleMenuMapper; -import com.youlai.system.pojo.entity.SysRoleMenu; +import com.youlai.system.model.entity.SysRoleMenu; import com.youlai.system.service.SysRoleMenuService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java index 2e51da2f..4841a44a 100644 --- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java @@ -8,19 +8,19 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.pojo.vo.Option; +import com.youlai.system.common.model.Option; import com.youlai.system.converter.RoleConverter; import com.youlai.system.mapper.SysRoleMapper; -import com.youlai.system.pojo.entity.SysRole; -import com.youlai.system.pojo.entity.SysRoleMenu; -import com.youlai.system.pojo.entity.SysUserRole; -import com.youlai.system.pojo.form.RoleForm; -import com.youlai.system.pojo.query.RolePageQuery; -import com.youlai.system.pojo.vo.RolePageVO; +import com.youlai.system.model.entity.SysRole; +import com.youlai.system.model.entity.SysRoleMenu; +import com.youlai.system.model.entity.SysUserRole; +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.service.SysRoleMenuService; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; -import com.youlai.system.framework.security.util.SecurityUtils; +import com.youlai.system.common.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * 角色业务实现类 * * @author haoxr - * @date 2022/6/3 + * @since 2022/6/3 */ @Service @RequiredArgsConstructor diff --git a/src/main/java/com/youlai/system/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserRoleServiceImpl.java index d191fe69..007440d2 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserRoleServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysUserRoleServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.mapper.SysUserRoleMapper; -import com.youlai.system.pojo.entity.SysUserRole; +import com.youlai.system.model.entity.SysUserRole; import com.youlai.system.service.SysUserRoleService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java index 5bbbde93..ffcd391b 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java @@ -11,17 +11,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.common.constant.SecurityConstants; import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.converter.UserConverter; -import com.youlai.system.framework.security.util.SecurityUtils; +import com.youlai.system.common.util.SecurityUtils; import com.youlai.system.mapper.SysUserMapper; -import com.youlai.system.pojo.bo.UserAuthInfo; -import com.youlai.system.pojo.bo.UserBO; -import com.youlai.system.pojo.bo.UserFormBO; -import com.youlai.system.pojo.entity.SysUser; -import com.youlai.system.pojo.form.UserForm; -import com.youlai.system.pojo.query.UserPageQuery; -import com.youlai.system.pojo.vo.UserExportVO; -import com.youlai.system.pojo.vo.UserInfoVO; -import com.youlai.system.pojo.vo.UserPageVO; +import com.youlai.system.model.dto.UserAuthInfo; +import com.youlai.system.model.bo.UserBO; +import com.youlai.system.model.bo.UserFormBO; +import com.youlai.system.model.entity.SysUser; +import com.youlai.system.model.form.UserForm; +import com.youlai.system.model.query.UserPageQuery; +import com.youlai.system.model.vo.UserExportVO; +import com.youlai.system.model.vo.UserInfoVO; +import com.youlai.system.model.vo.UserPageVO; import com.youlai.system.service.SysMenuService; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; * 用户业务实现类 * * @author haoxr - * @date 2022/1/14 + * @since 2022/1/14 */ @Service @RequiredArgsConstructor diff --git a/src/main/resources/mapper/SysDeptMapper.xml b/src/main/resources/mapper/SysDeptMapper.xml index 0ccc55ea..ecf26412 100644 --- a/src/main/resources/mapper/SysDeptMapper.xml +++ b/src/main/resources/mapper/SysDeptMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/src/main/resources/mapper/SysDictTypeMapper.xml b/src/main/resources/mapper/SysDictTypeMapper.xml index 73c159ee..06319d8b 100644 --- a/src/main/resources/mapper/SysDictTypeMapper.xml +++ b/src/main/resources/mapper/SysDictTypeMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index c279c5ca..bda56899 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -5,7 +5,7 @@ - + diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml index 2f8d41fe..61f72f1c 100644 --- a/src/main/resources/mapper/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -5,7 +5,7 @@ - SELECT u.id, u.username, @@ -42,7 +42,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -107,7 +107,7 @@ - SELECT u.username, u.nickname, diff --git a/src/test/java/com/youlai/system/ConfigLoadOrderTests.java b/src/test/java/com/youlai/system/ConfigLoadOrderTests.java index 91929f13..86e3ea1c 100644 --- a/src/test/java/com/youlai/system/ConfigLoadOrderTests.java +++ b/src/test/java/com/youlai/system/ConfigLoadOrderTests.java @@ -9,8 +9,8 @@ import org.springframework.core.env.Environment; /** * SpringBoot 配置加载顺序单元测试类 * - * @author: haoxr - * @date: 2023/02/23 + * @author haoxr + * @since 2023/02/23 */ @SpringBootTest @Slf4j diff --git a/src/test/java/com/youlai/system/RedisTests.java b/src/test/java/com/youlai/system/RedisTests.java index b9cefd2b..45380865 100644 --- a/src/test/java/com/youlai/system/RedisTests.java +++ b/src/test/java/com/youlai/system/RedisTests.java @@ -1,21 +1,17 @@ package com.youlai.system; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.NumberUtil; -import com.youlai.system.pojo.entity.SysUser; +import com.youlai.system.model.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.redis.core.RedisTemplate; -import java.math.BigDecimal; - /** * Redis 单元测试 * - * @author: haoxr - * @date: 2023/02/17 + * @author haoxr + * @since 2023/02/17 */ @SpringBootTest @Slf4j