From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 27 十月 2021 13:16:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken --- ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 159 ++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 114 insertions(+), 45 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 d66d86b..d7ae1cd 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,8 +1,9 @@ package com.ruoyi.framework.config; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.config.properties.RedissonProperties; +import lombok.extern.slf4j.Slf4j; import org.redisson.Redisson; import org.redisson.api.RedissonClient; import org.redisson.codec.JsonJacksonCodec; @@ -17,7 +18,6 @@ import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.core.script.DefaultRedisScript; import java.io.IOException; import java.util.HashMap; @@ -29,6 +29,7 @@ * * @author Lion Li */ +@Slf4j @Configuration @EnableCaching public class RedisConfig extends CachingConfigurerSupport { @@ -56,24 +57,55 @@ .setTransportMode(redissonProperties.getTransportMode()); RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig(); - // 浣跨敤鍗曟満妯″紡 - config.useSingleServer() - .setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort()) - .setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue()) - .setDatabase(redisProperties.getDatabase()) - .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null) - .setTimeout(singleServerConfig.getTimeout()) - .setRetryAttempts(singleServerConfig.getRetryAttempts()) - .setRetryInterval(singleServerConfig.getRetryInterval()) - .setSubscriptionsPerConnection(singleServerConfig.getSubscriptionsPerConnection()) - .setClientName(singleServerConfig.getClientName()) - .setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout()) - .setSubscriptionConnectionMinimumIdleSize(singleServerConfig.getSubscriptionConnectionMinimumIdleSize()) - .setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize()) - .setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize()) - .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize()) - .setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval()); - return Redisson.create(config); + if (ObjectUtil.isNotNull(singleServerConfig)) { + // 浣跨敤鍗曟満妯″紡 + config.useSingleServer() + .setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort()) + .setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue()) + .setDatabase(redisProperties.getDatabase()) + .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null) + .setTimeout(singleServerConfig.getTimeout()) + .setRetryAttempts(singleServerConfig.getRetryAttempts()) + .setRetryInterval(singleServerConfig.getRetryInterval()) + .setSubscriptionsPerConnection(singleServerConfig.getSubscriptionsPerConnection()) + .setClientName(singleServerConfig.getClientName()) + .setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout()) + .setSubscriptionConnectionMinimumIdleSize(singleServerConfig.getSubscriptionConnectionMinimumIdleSize()) + .setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize()) + .setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize()) + .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize()) + .setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval()); + } + // 闆嗙兢閰嶇疆鏂瑰紡 鍙傝�冧笅鏂规敞閲� + RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig(); + if (ObjectUtil.isNotNull(clusterServersConfig)) { + // 浣跨敤闆嗙兢妯″紡 + config.useClusterServers() + .setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue()) + .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null) + .setTimeout(clusterServersConfig.getTimeout()) + .setRetryAttempts(clusterServersConfig.getRetryAttempts()) + .setRetryInterval(clusterServersConfig.getRetryInterval()) + .setSubscriptionsPerConnection(clusterServersConfig.getSubscriptionsPerConnection()) + .setClientName(clusterServersConfig.getClientName()) + .setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout()) + .setPingConnectionInterval(clusterServersConfig.getPingConnectionInterval()) + .setSubscriptionConnectionMinimumIdleSize(clusterServersConfig.getSubscriptionConnectionMinimumIdleSize()) + .setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize()) + .setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize()) + .setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize()) + .setSlaveConnectionMinimumIdleSize(clusterServersConfig.getSlaveConnectionMinimumIdleSize()) + .setSlaveConnectionPoolSize(clusterServersConfig.getSlaveConnectionPoolSize()) + .setDnsMonitoringInterval(clusterServersConfig.getDnsMonitoringInterval()) + .setFailedSlaveReconnectionInterval(clusterServersConfig.getFailedSlaveReconnectionInterval()) + .setScanInterval(clusterServersConfig.getScanInterval()) + .setReadMode(clusterServersConfig.getReadMode()) + .setSubscriptionMode(clusterServersConfig.getSubscriptionMode()) + .setNodeAddresses(redisProperties.getCluster().getNodes()); + } + RedissonClient redissonClient = Redisson.create(config); + log.info("鍒濆鍖� redis 閰嶇疆"); + return redissonClient; } /** @@ -91,32 +123,69 @@ return new RedissonSpringCacheManager(redissonClient, config, JsonJacksonCodec.INSTANCE); } - @Bean - public DefaultRedisScript<Long> limitScript() { - DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>(); - redisScript.setScriptText(limitScriptText()); - redisScript.setResultType(Long.class); - return redisScript; - } - /** - * 闄愭祦鑴氭湰 + * redis闆嗙兢閰嶇疆 yml + * + * --- # redis 闆嗙兢閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀) + * spring: + * redis: + * cluster: + * nodes: + * - 192.168.0.100:6379 + * - 192.168.0.101:6379 + * - 192.168.0.102:6379 + * # 瀵嗙爜 + * password: + * # 杩炴帴瓒呮椂鏃堕棿 + * timeout: 10s + * # 鏄惁寮�鍚痵sl + * ssl: false + * + * redisson: + * # 绾跨▼姹犳暟閲� + * threads: 16 + * # Netty绾跨▼姹犳暟閲� + * nettyThreads: 32 + * # 浼犺緭妯″紡 + * transportMode: "NIO" + * # 闆嗙兢閰嶇疆 + * clusterServersConfig: + * # 瀹㈡埛绔悕绉� + * clientName: ${ruoyi.name} + * # master鏈�灏忕┖闂茶繛鎺ユ暟 + * masterConnectionMinimumIdleSize: 32 + * # master杩炴帴姹犲ぇ灏� + * masterConnectionPoolSize: 64 + * # slave鏈�灏忕┖闂茶繛鎺ユ暟 + * slaveConnectionMinimumIdleSize: 32 + * # slave杩炴帴姹犲ぇ灏� + * slaveConnectionPoolSize: 64 + * # 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣 + * idleConnectionTimeout: 10000 + * # ping杩炴帴闂撮殧 + * pingConnectionInterval: 1000 + * # 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣 + * timeout: 3000 + * # 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆� + * retryAttempts: 3 + * # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉� + * retryInterval: 1500 + * # 浠庡彲鐢ㄦ湇鍔″櫒鐨勫唴閮ㄥ垪琛ㄤ腑鎺掗櫎 Redis Slave 閲嶆柊杩炴帴灏濊瘯鐨勯棿闅斻�� + * failedSlaveReconnectionInterval: 3000 + * # 鍙戝竷鍜岃闃呰繛鎺ユ睜鏈�灏忕┖闂茶繛鎺ユ暟 + * subscriptionConnectionMinimumIdleSize: 1 + * # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬 + * subscriptionConnectionPoolSize: 50 + * # 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲� + * subscriptionsPerConnection: 5 + * # 鎵弿闂撮殧 + * scanInterval: 1000 + * # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣 + * dnsMonitoringInterval: 5000 + * # 璇诲彇妯″紡 + * readMode: "SLAVE" + * # 璁㈤槄妯″紡 + * subscriptionMode: "MASTER" */ - private String limitScriptText() { - return StrUtil.builder() - .append("local key = KEYS[1]\n") - .append("local count = tonumber(ARGV[1])\n") - .append("local time = tonumber(ARGV[2])\n") - .append("local current = redis.call('get', key);\n") - .append("if current and tonumber(current) > count then\n") - .append(" return current;\n") - .append("end\n") - .append("current = redis.call('incr', key)\n") - .append("if tonumber(current) == 1 then\n") - .append(" redis.call('expire', key, time)\n") - .append("end\n") - .append("return current;") - .toString(); - } } -- Gitblit v1.9.3