diff --git a/template/common/src/main/java/{{.packagePath}}/common/redis/RedisPoolConfig.java b/template/common/src/main/java/{{.packagePath}}/common/redis/RedisPoolConfig.java index a9e17a1..85ce928 100644 --- a/template/common/src/main/java/{{.packagePath}}/common/redis/RedisPoolConfig.java +++ b/template/common/src/main/java/{{.packagePath}}/common/redis/RedisPoolConfig.java @@ -1,20 +1,16 @@ package {{ .package }}.common.redis; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import redis.clients.jedis.HostAndPort; -import redis.clients.jedis.JedisCluster; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; import cn.hutool.core.util.StrUtil; import org.springframework.beans.factory.annotation.Value; -import java.util.HashSet; -import java.util.Set; @Configuration @EnableConfigurationProperties({RedisPoolProperties.class}) @@ -25,17 +21,12 @@ public class RedisPoolConfig { @Value("${redis-config.pool.password:}") private String password; - private JedisPoolConfig initPoolConfig() { JedisPoolConfig poolConfig = new JedisPoolConfig(); poolConfig.setMaxTotal(redisPoolProperties.getMaxTotal()); poolConfig.setMaxIdle(redisPoolProperties.getMaxIdle()); poolConfig.setMinIdle(redisPoolProperties.getMinIdle()); - poolConfig.setMaxWaitMillis(redisPoolProperties.getMaxWaitMillis()); poolConfig.setNumTestsPerEvictionRun(redisPoolProperties.getNumTestsPerEvictionRun()); - poolConfig.setTimeBetweenEvictionRunsMillis(redisPoolProperties.getTimeBetweenEvictionRunsMillis()); - poolConfig.setMinEvictableIdleTimeMillis(redisPoolProperties.getMinEvictableIdleTimeMillis()); - poolConfig.setSoftMinEvictableIdleTimeMillis(redisPoolProperties.getSoftMinEvictableIdleTimeMillis()); poolConfig.setTestOnBorrow(redisPoolProperties.isTestOnBorrow()); poolConfig.setTestOnReturn(redisPoolProperties.isTestOnReturn()); poolConfig.setTestWhileIdle(redisPoolProperties.isTestWhileIdle());