From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 30 ------------------------------
1 files changed, 0 insertions(+), 30 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 59f9f97..c1c303a 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,7 +1,6 @@
package com.ruoyi.framework.config;
import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.properties.RedissonProperties;
import lombok.extern.slf4j.Slf4j;
@@ -19,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;
@@ -123,34 +121,6 @@
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