From 7e626ea2193d39217fa7321a865bfab014c5ea69 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 22 五月 2022 13:07:36 +0800
Subject: [PATCH] update xxl-job 2.3.0 => 2.3.1
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
index a8bec41..8364c64 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
+++ b/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
* # 璇诲彇妯″紡
--
Gitblit v1.9.3