From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 bc28657..d66d86b 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.StrUtil;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.properties.RedissonProperties;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
@@ -16,6 +17,7 @@
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;
@@ -59,7 +61,7 @@
.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
.setDatabase(redisProperties.getDatabase())
- .setPassword(StrUtil.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
+ .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
.setTimeout(singleServerConfig.getTimeout())
.setRetryAttempts(singleServerConfig.getRetryAttempts())
.setRetryInterval(singleServerConfig.getRetryInterval())
@@ -89,4 +91,32 @@
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