Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-27 dd37247e65374dd4ef7e8e8b9212d8f29023e301

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

@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * redis配置
@@ -80,6 +81,12 @@
      RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
      if (ObjectUtil.isNotNull(clusterServersConfig)) {
         // 使用集群模式
            String finalPrefix = prefix;
            List<String> nodes = redisProperties.getCluster().getNodes()
                .stream()
                .map(node -> finalPrefix + node)
                .collect(Collectors.toList());

         config.useClusterServers()
               .setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
               .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
@@ -101,7 +108,7 @@
               .setScanInterval(clusterServersConfig.getScanInterval())
               .setReadMode(clusterServersConfig.getReadMode())
               .setSubscriptionMode(clusterServersConfig.getSubscriptionMode())
               .setNodeAddresses(redisProperties.getCluster().getNodes());
                .setNodeAddresses(nodes);
      }
      RedissonClient redissonClient = Redisson.create(config);
      log.info("初始化 redis 配置");