Merge branch 'master' into ldap

src/main/java/cn/qg/holmes/config/RedisConfig.java

@@ -45,10 +45,11 @@ public class RedisConfig extends CachingConfigurerSupport {
     public JedisPoolConfig jedisPoolConfig() {
         JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
         jedisPoolConfig.setMaxTotal(32);
-        jedisPoolConfig.setMaxIdle(16);
-        jedisPoolConfig.setMinIdle(8);
-        jedisPoolConfig.setMaxWaitMillis(5000);
+        jedisPoolConfig.setMaxIdle(32);
+        jedisPoolConfig.setMinIdle(0);
         jedisPoolConfig.setTestOnBorrow(true);
+        jedisPoolConfig.setTestWhileIdle(true);
+        jedisPoolConfig.setTestOnReturn(true);
         return jedisPoolConfig;
     }