sync -- 同步 RuoYi-Vue-Plus 更新。

使用 spring cglib 替换停止维护的 cglib 修复 cos_api bcprov-jdk15on 漏洞修复 guava 漏洞统一依赖版本修复 tlog 依赖漏洞优化登录失败相关部分代码结构优化文件上传、图片上传组件文件列表展示文件原名便于后续处理, 完善组件删除功能 springboot 2.6.6 => 2.6.7 发布 4.1.0
2022-05-06 22:42:32 +08:00
parent 4d3f6652b7
commit f6995953d8
52 changed files with 451 additions and 1082 deletions
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
@@ -12,7 +12,6 @@ import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
-import com.ruoyi.framework.config.properties.RepeatSubmitProperties;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -43,12 +42,10 @@ public class RepeatSubmitAspect {

    private static final ThreadLocal<String> KEY_CACHE = new ThreadLocal<>();

-    private final RepeatSubmitProperties repeatSubmitProperties;
-
    @Before("@annotation(repeatSubmit)")
    public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable {
        // 如果注解不为0 则使用注解数值
-        long interval = repeatSubmitProperties.getInterval();
+        long interval = 0;
        if (repeatSubmit.interval() > 0) {
            interval = repeatSubmit.timeUnit().toMillis(repeatSubmit.interval());
        }
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
@@ -53,8 +53,7 @@ public class RedisConfig extends CachingConfigurerSupport {
        Config config = new Config();
        config.setThreads(redissonProperties.getThreads())
            .setNettyThreads(redissonProperties.getNettyThreads())
-            .setCodec(JsonJacksonCodec.INSTANCE)
-            .setTransportMode(redissonProperties.getTransportMode());
+            .setCodec(JsonJacksonCodec.INSTANCE);

        RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig();
        if (ObjectUtil.isNotNull(singleServerConfig)) {
@@ -65,8 +64,6 @@ public class RedisConfig extends CachingConfigurerSupport {
                .setDatabase(redisProperties.getDatabase())
                .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
                .setTimeout(singleServerConfig.getTimeout())
-                .setRetryAttempts(singleServerConfig.getRetryAttempts())
-                .setRetryInterval(singleServerConfig.getRetryInterval())
                .setClientName(singleServerConfig.getClientName())
                .setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
                .setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
@@ -87,11 +84,8 @@ public class RedisConfig extends CachingConfigurerSupport {
                .setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
                .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
                .setTimeout(clusterServersConfig.getTimeout())
-                .setRetryAttempts(clusterServersConfig.getRetryAttempts())
-                .setRetryInterval(clusterServersConfig.getRetryInterval())
                .setClientName(clusterServersConfig.getClientName())
                .setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
-                .setPingConnectionInterval(clusterServersConfig.getPingConnectionInterval())
                .setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize())
                .setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize())
                .setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize())
@@ -144,8 +138,6 @@ public class RedisConfig extends CachingConfigurerSupport {
     *   threads: 16
     *   # Netty线程池数量
     *   nettyThreads: 32
-     *   # 传输模式
-     *   transportMode: "NIO"
     *   # 集群配置
     *   clusterServersConfig:
     *     # 客户端名称
@@ -160,14 +152,8 @@ public class RedisConfig extends CachingConfigurerSupport {
     *     slaveConnectionPoolSize: 64
     *     # 连接空闲超时，单位：毫秒
     *     idleConnectionTimeout: 10000
-     *     # ping连接间隔
-     *     pingConnectionInterval: 1000
     *     # 命令等待超时，单位：毫秒
     *     timeout: 3000
-     *     # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
-     *     retryAttempts: 3
-     *     # 命令重试发送时间间隔，单位：毫秒
-     *     retryInterval: 1500
     *     # 发布和订阅连接池大小
     *     subscriptionConnectionPoolSize: 50
     *     # 读取模式
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
@@ -1,7 +1,6 @@
 package com.ruoyi.framework.config;

 import com.ruoyi.common.utils.Threads;
-import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.framework.config.properties.ThreadPoolProperties;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

-import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -23,6 +21,11 @@ import java.util.concurrent.ThreadPoolExecutor;
@Configuration
 public class ThreadPoolConfig {

+    /**
+     * 核心线程数 = cpu 核心数 + 1
+     */
+    private final int core = Runtime.getRuntime().availableProcessors() + 1;
+
    @Autowired
    private ThreadPoolProperties threadPoolProperties;

@@ -30,12 +33,11 @@ public class ThreadPoolConfig {
    @ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true")
    public ThreadPoolTaskExecutor threadPoolTaskExecutor() {
        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setMaxPoolSize(threadPoolProperties.getMaxPoolSize());
-        executor.setCorePoolSize(threadPoolProperties.getCorePoolSize());
+        executor.setMaxPoolSize(core);
+        executor.setCorePoolSize(core * 2);
        executor.setQueueCapacity(threadPoolProperties.getQueueCapacity());
        executor.setKeepAliveSeconds(threadPoolProperties.getKeepAliveSeconds());
-        RejectedExecutionHandler handler = ReflectUtils.newInstance(threadPoolProperties.getRejectedExecutionHandler().getClazz());
-        executor.setRejectedExecutionHandler(handler);
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
        return executor;
    }

@@ -44,7 +46,7 @@ public class ThreadPoolConfig {
     */
    @Bean(name = "scheduledExecutorService")
    protected ScheduledExecutorService scheduledExecutorService() {
-        return new ScheduledThreadPoolExecutor(threadPoolProperties.getCorePoolSize(),
+        return new ScheduledThreadPoolExecutor(core,
            new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
            new ThreadPoolExecutor.CallerRunsPolicy()) {
            @Override
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.redisson.config.ReadMode;
 import org.redisson.config.SubscriptionMode;
-import org.redisson.config.TransportMode;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

@@ -30,11 +29,6 @@ public class RedissonProperties {
     */
    private int nettyThreads;

-    /**
-     * 传输模式
-     */
-    private TransportMode transportMode;
-
    /**
     * 单机服务配置
     */
@@ -79,16 +73,6 @@ public class RedissonProperties {
         */
        private int timeout;

-        /**
-         * 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
-         */
-        private int retryAttempts;
-
-        /**
-         * 命令重试发送时间间隔，单位：毫秒
-         */
-        private int retryInterval;
-
        /**
         * 发布和订阅连接池大小
         */
@@ -130,26 +114,11 @@ public class RedissonProperties {
         */
        private int idleConnectionTimeout;

-        /**
-         * ping超时
-         */
-        private int pingConnectionInterval;
-
        /**
         * 命令等待超时，单位：毫秒
         */
        private int timeout;

-        /**
-         * 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
-         */
-        private int retryAttempts;
-
-        /**
-         * 命令重试发送时间间隔，单位：毫秒
-         */
-        private int retryInterval;
-
        /**
         * 发布和订阅连接池大小
         */
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java
@@ -1,22 +0,0 @@
-package com.ruoyi.framework.config.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 重复提交 配置属性
- *
- * @author Lion Li
- */
-@Data
-@Component
-@ConfigurationProperties(prefix = "repeat-submit")
-public class RepeatSubmitProperties {
-
-    /**
-     * 间隔时间(毫秒)
-     */
-    private int interval;
-
-}
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java
@@ -1,6 +1,5 @@
 package com.ruoyi.framework.config.properties;

-import com.ruoyi.common.enums.ThreadPoolRejectedPolicy;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
@@ -20,16 +19,6 @@ public class ThreadPoolProperties {
     */
    private boolean enabled;

-    /**
-     * 核心线程池大小
-     */
-    private int corePoolSize;
-
-    /**
-     * 最大可创建的线程数
-     */
-    private int maxPoolSize;
-
    /**
     * 队列最大长度
     */
@@ -40,9 +29,4 @@ public class ThreadPoolProperties {
     */
    private int keepAliveSeconds;

-    /**
-     * 线程池对拒绝任务(无线程可用)的处理策略
-     */
-    private ThreadPoolRejectedPolicy rejectedExecutionHandler;
-
 }