Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-08-17 896939ce4ea889f0452643515ec5a227020ac89f

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java

@@ -1,20 +1,26 @@
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;
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 java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * redis配置
@@ -53,7 +59,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())
@@ -67,4 +73,48 @@
         .setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval());
      return Redisson.create(config);
   }

   /**
    * 整合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 "local key = KEYS[1]\n" +
         "local count = tonumber(ARGV[1])\n" +
         "local time = tonumber(ARGV[2])\n" +
         "local current = redis.call('get', key);\n" +
         "if current and tonumber(current) > count then\n" +
         "    return current;\n" +
         "end\n" +
         "current = redis.call('incr', key)\n" +
         "if tonumber(current) == 1 then\n" +
         "    redis.call('expire', key, time)\n" +
         "end\n" +
         "return current;";
   }

}