Merge branch 'master' of zhushouping/kmall-pt into master

redis 问题处理

kmall-manager/src/main/java/com/kmall/manager/manager/redis/JedisUtil.java

@@ -930,7 +930,7 @@ public class JedisUtil implements Serializable {
         try {
             logger.debug("jedisPool.{}", jedisPool);
             jedis = jedisPool.getResource();
-            // logger.debug("getResource.", jedis);
+             logger.debug("getResource.", jedis);
         } catch (JedisException e) {
             logger.warn("getResource.", e);
             returnBrokenResource(jedis);

kmall-manager/src/main/resources/conf/redis.properties

@@ -15,7 +15,7 @@ redis.dev.pool.testOnBorrow=true
 
 # \u4E2D\u7F51\u751F\u4EA7\u73AF\u5883
 redis.prod.keyPrefix=platform
-redis.prod.host=172.18.132.30
+redis.prod.host=120.78.152.8
 redis.prod.port=6379
 redis.prod.password=Abc-123#*.-
 redis.prod.database=10