From a5c00818854be83df5c919f24220593c591fc00b Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 3 Sep 2024 08:28:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8Esystem=E6=9C=8D=E5=8A=A1=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=90=AF=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/youlai/common/core/aspect/RepeatSubmitAspect.java | 4 ++-- .../youlai/common/mybatis/annotation/DataPermission.java | 5 +++-- .../com/youlai/common/mybatis/enums/DataScopeEnum.java | 7 +++---- ...gframework.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../common/security/config/ResourceServerConfig.java | 2 +- .../com/youlai/common/rabbitmq/config/RabbitConfig.java | 5 +++-- .../com/youlai/common/redis/config/RedisCacheConfig.java | 1 + youlai-common/common-service/common-file/pom.xml | 2 +- ...gframework.boot.autoconfigure.AutoConfiguration.imports | 0 .../java/com/youlai/system/controller/FileController.java | 4 ++-- 10 files changed, 17 insertions(+), 15 deletions(-) rename youlai-common/common-service/common-file/src/main/resources/{META_INF => META-INF}/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) diff --git a/youlai-common/common-core/src/main/java/com/youlai/common/core/aspect/RepeatSubmitAspect.java b/youlai-common/common-core/src/main/java/com/youlai/common/core/aspect/RepeatSubmitAspect.java index f09b8b1e8..2fe7a25e9 100644 --- a/youlai-common/common-core/src/main/java/com/youlai/common/core/aspect/RepeatSubmitAspect.java +++ b/youlai-common/common-core/src/main/java/com/youlai/common/core/aspect/RepeatSubmitAspect.java @@ -40,10 +40,10 @@ public class RepeatSubmitAspect { * 防重复提交切点 */ @Pointcut("@annotation(repeatSubmit)") - public void preventDuplicateSubmitPointCut(RepeatSubmit repeatSubmit) { + public void repeatSubmitPointCut(RepeatSubmit repeatSubmit) { } - @Around(value = "preventDuplicateSubmitPointCut(repeatSubmit)", argNames = "pjp,preventDuplicateResubmit") + @Around(value = "repeatSubmitPointCut(repeatSubmit)", argNames = "pjp,repeatSubmit") public Object doAround(ProceedingJoinPoint pjp, RepeatSubmit repeatSubmit) throws Throwable { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); diff --git a/youlai-common/common-framework/common-mybatis/src/main/java/com/youlai/common/mybatis/annotation/DataPermission.java b/youlai-common/common-framework/common-mybatis/src/main/java/com/youlai/common/mybatis/annotation/DataPermission.java index 153ef5a9b..e3d41cc73 100644 --- a/youlai-common/common-framework/common-mybatis/src/main/java/com/youlai/common/mybatis/annotation/DataPermission.java +++ b/youlai-common/common-framework/common-mybatis/src/main/java/com/youlai/common/mybatis/annotation/DataPermission.java @@ -5,9 +5,9 @@ import java.lang.annotation.*; /** * MP数据权限注解 *

- * https://gitee.com/baomidou/mybatis-plus/issues/I37I90 * - * @author zc + * @author zc + * @link https://gitee.com/baomidou/mybatis-plus/issues/I37I90 * @since 2021-12-10 15:48 */ @Documented @@ -21,6 +21,7 @@ public @interface DataPermission { String deptAlias() default ""; String deptIdColumnName() default "dept_id"; + String userAlias() default ""; String userIdColumnName() default "create_by"; diff --git a/youlai-common/common-framework/common-mybatis/src/main/java/com/youlai/common/mybatis/enums/DataScopeEnum.java b/youlai-common/common-framework/common-mybatis/src/main/java/com/youlai/common/mybatis/enums/DataScopeEnum.java index 15d6a395e..14f296e31 100644 --- a/youlai-common/common-framework/common-mybatis/src/main/java/com/youlai/common/mybatis/enums/DataScopeEnum.java +++ b/youlai-common/common-framework/common-mybatis/src/main/java/com/youlai/common/mybatis/enums/DataScopeEnum.java @@ -9,6 +9,7 @@ import lombok.Getter; * @author Ray * @since 2022/10/14 */ +@Getter public enum DataScopeEnum implements IBaseEnum { /** @@ -19,11 +20,9 @@ public enum DataScopeEnum implements IBaseEnum { DEPT(2, "本部门数据"), SELF(3, "本人数据"); - @Getter - private Integer value; + private final Integer value; - @Getter - private String label; + private final String label; DataScopeEnum(Integer value, String label) { this.value = value; diff --git a/youlai-common/common-framework/common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/youlai-common/common-framework/common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1c73817e0..f6b104b54 100644 --- a/youlai-common/common-framework/common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/youlai-common/common-framework/common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.youlai.common.core.config.MybatisPlusConfig +com.youlai.common.mybatis.config.MybatisPlusConfig com.youlai.common.mybatis.handler.MyMetaObjectHandler \ No newline at end of file diff --git a/youlai-common/common-framework/common-security/src/main/java/com/youlai/common/security/config/ResourceServerConfig.java b/youlai-common/common-framework/common-security/src/main/java/com/youlai/common/security/config/ResourceServerConfig.java index 4392feff6..bb21c729f 100644 --- a/youlai-common/common-framework/common-security/src/main/java/com/youlai/common/security/config/ResourceServerConfig.java +++ b/youlai-common/common-framework/common-security/src/main/java/com/youlai/common/security/config/ResourceServerConfig.java @@ -43,10 +43,10 @@ public class ResourceServerConfig { @Autowired private AccessDeniedHandler accessDeniedHandler; + @Autowired private AuthenticationEntryPoint authenticationEntryPoint; - /** * 白名单路径列表 */ diff --git a/youlai-common/common-middleware/common-rabbitmq/src/main/java/com/youlai/common/rabbitmq/config/RabbitConfig.java b/youlai-common/common-middleware/common-rabbitmq/src/main/java/com/youlai/common/rabbitmq/config/RabbitConfig.java index 4b46c210a..ce1029646 100644 --- a/youlai-common/common-middleware/common-rabbitmq/src/main/java/com/youlai/common/rabbitmq/config/RabbitConfig.java +++ b/youlai-common/common-middleware/common-rabbitmq/src/main/java/com/youlai/common/rabbitmq/config/RabbitConfig.java @@ -9,8 +9,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** + * RabbitMQ 配置 + * * @author huawei - * @email huawei_code@163.com * @since 2021/1/17 */ @Configuration @@ -24,7 +25,7 @@ public class RabbitConfig { public RabbitListenerContainerFactory rabbitListenerContainerFactory(ConnectionFactory connectionFactory) { SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory(); factory.setConnectionFactory(connectionFactory); - factory.setMessageConverter( new Jackson2JsonMessageConverter()); + factory.setMessageConverter(new Jackson2JsonMessageConverter()); return factory; } } diff --git a/youlai-common/common-middleware/common-redis/src/main/java/com/youlai/common/redis/config/RedisCacheConfig.java b/youlai-common/common-middleware/common-redis/src/main/java/com/youlai/common/redis/config/RedisCacheConfig.java index 01c15a057..9a8e6fcd6 100644 --- a/youlai-common/common-middleware/common-redis/src/main/java/com/youlai/common/redis/config/RedisCacheConfig.java +++ b/youlai-common/common-middleware/common-redis/src/main/java/com/youlai/common/redis/config/RedisCacheConfig.java @@ -16,6 +16,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; * Redis缓存配置 * * @author Ray + * @since 2022/7/2 */ @EnableConfigurationProperties(CacheProperties.class) @Configuration diff --git a/youlai-common/common-service/common-file/pom.xml b/youlai-common/common-service/common-file/pom.xml index 2852bfe56..0ee5d729e 100644 --- a/youlai-common/common-service/common-file/pom.xml +++ b/youlai-common/common-service/common-file/pom.xml @@ -23,7 +23,7 @@ spring-boot-starter-web - + io.minio minio diff --git a/youlai-common/common-service/common-file/src/main/resources/META_INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/youlai-common/common-service/common-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from youlai-common/common-service/common-file/src/main/resources/META_INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to youlai-common/common-service/common-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/youlai-system/system-boot/src/main/java/com/youlai/system/controller/FileController.java b/youlai-system/system-boot/src/main/java/com/youlai/system/controller/FileController.java index 7089d5d83..d1210fd50 100644 --- a/youlai-system/system-boot/src/main/java/com/youlai/system/controller/FileController.java +++ b/youlai-system/system-boot/src/main/java/com/youlai/system/controller/FileController.java @@ -1,7 +1,7 @@ package com.youlai.system.controller; -import com.youlai.common.oss.model.FileInfo; -import com.youlai.common.oss.service.OssService; +import com.youlai.common.file.model.FileInfo; +import com.youlai.common.file.service.OssService; import com.youlai.common.result.Result; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation;