From ddf8d6ad6b156ee03ed6e86f776a43c1ac17d689 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 九月 2021 13:48:22 +0800
Subject: [PATCH] 发布 v3.1.0
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 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 b868729..867cd40 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,25 +1,36 @@
package com.ruoyi.framework.config;
+import cn.hutool.core.util.StrUtil;
+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;
import org.redisson.config.Config;
+import org.redisson.spring.cache.CacheConfig;
+import org.redisson.spring.cache.RedissonSpringCacheManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport;
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;
+import java.util.List;
+import java.util.Map;
/**
* redis閰嶇疆
*
* @author Lion Li
*/
+@Slf4j
@Configuration
@EnableCaching
public class RedisConfig extends CachingConfigurerSupport {
@@ -52,7 +63,7 @@
.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
.setDatabase(redisProperties.getDatabase())
- .setPassword(redisProperties.getPassword())
+ .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
.setTimeout(singleServerConfig.getTimeout())
.setRetryAttempts(singleServerConfig.getRetryAttempts())
.setRetryInterval(singleServerConfig.getRetryInterval())
@@ -64,6 +75,52 @@
.setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize())
.setConnectionPoolSize(singleServerConfig.getConnectionPoolSize())
.setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval());
- return Redisson.create(config);
+ RedissonClient redissonClient = Redisson.create(config);
+ log.info("鍒濆鍖� redis 閰嶇疆");
+ return redissonClient;
}
+
+ /**
+ * 鏁村悎spring-cache
+ */
+ @Bean
+ public CacheManager cacheManager(RedissonClient redissonClient) {
+ List<RedissonProperties.CacheGroup> cacheGroup = redissonProperties.getCacheGroup();
+ Map<String, CacheConfig> config = new HashMap<>();
+ for (RedissonProperties.CacheGroup group : cacheGroup) {
+ CacheConfig cacheConfig = new CacheConfig(group.getTtl(), group.getMaxIdleTime());
+ cacheConfig.setMaxSize(group.getMaxSize());
+ config.put(group.getGroupId(), cacheConfig);
+ }
+ 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;
+ }
+
+ /**
+ * 闄愭祦鑴氭湰
+ */
+ 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