update xxl-job 2.3.0 => 2.3.1

疯狂的狮子Li

2022-05-22 7e626ea2193d39217fa7321a865bfab014c5ea69

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java

@@ -1,6 +1,7 @@
package com.ruoyi.framework.config;

import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.properties.RedissonProperties;
import lombok.extern.slf4j.Slf4j;
@@ -43,9 +44,12 @@
    @Autowired
    private RedissonProperties redissonProperties;

    @Autowired
    private ObjectMapper objectMapper;

    @Primary
    @Bean(destroyMethod = "shutdown")
    public RedissonClient redisson() {
    public RedissonClient redisson(RedisProperties redisProperties, RedissonProperties redissonProperties, ObjectMapper objectMapper) {
        String prefix = REDIS_PROTOCOL_PREFIX;
        if (redisProperties.isSsl()) {
            prefix = REDISS_PROTOCOL_PREFIX;
@@ -53,8 +57,7 @@
        Config config = new Config();
        config.setThreads(redissonProperties.getThreads())
            .setNettyThreads(redissonProperties.getNettyThreads())
            .setCodec(JsonJacksonCodec.INSTANCE)
            .setTransportMode(redissonProperties.getTransportMode());
            .setCodec(new JsonJacksonCodec(objectMapper));

        RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig();
        if (ObjectUtil.isNotNull(singleServerConfig)) {
@@ -65,8 +68,6 @@
                .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 +88,8 @@
                .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())
@@ -118,7 +116,7 @@
            cacheConfig.setMaxSize(group.getMaxSize());
            config.put(group.getGroupId(), cacheConfig);
        }
        return new RedissonSpringCacheManager(redissonClient, config, JsonJacksonCodec.INSTANCE);
        return new RedissonSpringCacheManager(redissonClient, config, new JsonJacksonCodec(objectMapper));
    }

    /**
@@ -144,8 +142,6 @@
     *   threads: 16
     *   # Netty线程池数量
     *   nettyThreads: 32
     *   # 传输模式
     *   transportMode: "NIO"
     *   # 集群配置
     *   clusterServersConfig:
     *     # 客户端名称
@@ -160,14 +156,8 @@
     *     slaveConnectionPoolSize: 64
     *     # 连接空闲超时，单位：毫秒
     *     idleConnectionTimeout: 10000
     *     # ping连接间隔
     *     pingConnectionInterval: 1000
     *     # 命令等待超时，单位：毫秒
     *     timeout: 3000
     *     # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
     *     retryAttempts: 3
     *     # 命令重试发送时间间隔，单位：毫秒
     *     retryInterval: 1500
     *     # 发布和订阅连接池大小
     *     subscriptionConnectionPoolSize: 50
     *     # 读取模式