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

redis 问题处理

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

@@ -15,6 +15,28 @@ public class JedisProperties implements Serializable {
     private String port;
     private Pool pool;
 
+    private String password;
+    private int database;
+
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public int getDatabase() {
+        return database;
+    }
+
+    public void setDatabase(int database) {
+        this.database = database;
+    }
+
+
+
     public String getKeyPrefix() {
         return keyPrefix;
     }

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

@@ -3,11 +3,12 @@ package com.kmall.manager.manager.redis;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 
+//import javax.annotation.PostConstruct;
+
 /**
  * @author Scott Chen
  * @since 1.0

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

@@ -43,11 +43,13 @@ public class JedisUtil implements Serializable {
             config.setTestOnBorrow(Boolean.parseBoolean(jp.getPool().getTestOnBorrow()));
             String redisIp = jp.getHost();
             int port = Integer.parseInt(jp.getPort());
-            jedisPool = new JedisPool(config, redisIp, port, 10000);
+            String password = jp.getPassword();
+            int database = jp.getDatabase();
+            jedisPool = new JedisPool(config, redisIp, port, 10000, password, database);
 
-            logger.info("redis连接成功: {}:{}, ", redisIp, port);
+            logger.info("redis连接成功: {}:{}, 连接池：{}", redisIp, port, jedisPool);
         } catch (Exception e) {
-            logger.error("init RedisUtils is error");
+            logger.error("init RedisUtils is error", e);
             e.printStackTrace();
         }
     }
@@ -926,6 +928,7 @@ public class JedisUtil implements Serializable {
     public static Jedis getResource() throws JedisException {
         Jedis jedis = null;
         try {
+            logger.debug("jedisPool.{}", jedisPool);
             jedis = jedisPool.getResource();
             // logger.debug("getResource.", jedis);
         } catch (JedisException e) {

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

@@ -1,9 +1,9 @@
 ########## \u6570\u636E\u5E93\u914D\u7F6E ##########
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
-jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=tuser
-jdbc.password=Qq!123
+#jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=tuser
+#jdbc.password=Qq!123
 #jdbc.url=jdbc:mysql://127.0.0.1:3306/kmall_pt?serverTimezone=GMT%2B8&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=root
 #jdbc.password=root
@@ -30,9 +30,9 @@ jdbc.validationTimeout=4000
 ##\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
 ####jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 ##\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
-#jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-#jdbc.username=kmall_pt
-#jdbc.password=AFnwRBu!3q
+jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=kmall_pt
+jdbc.password=AFnwRBu!3q
 #
 #jdbc.initialSize=5
 #jdbc.maxActive=30

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

@@ -1,7 +1,7 @@
 ########## redis \u914D\u7F6E ##########
 
 # [dev, prod]
-redis.env = dev
+redis.env = prod
 
 # \u5F00\u53D1\u73AF\u5883
 redis.dev.keyPrefix=platform
@@ -17,6 +17,8 @@ redis.dev.pool.testOnBorrow=true
 redis.prod.keyPrefix=platform
 redis.prod.host=172.18.132.30
 redis.prod.port=6379
+redis.prod.password=Abc-123#*.-
+redis.prod.database=10
 redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000

kmall-manager/src/main/resources/spring/spring-redis.xml

@@ -21,6 +21,8 @@
         <property name="keyPrefix" value="${redis.prod.keyPrefix}"/>
         <property name="host" value="${redis.prod.host}"/>
         <property name="port" value="${redis.prod.port}"/>
+        <property name="password" value="${redis.prod.password}"/>
+        <property name="database" value="${redis.prod.database}"/>
         <property name="pool">
             <bean class="com.kmall.manager.manager.redis.JedisProperties$Pool">
                 <property name="maxIdle" value="${redis.prod.pool.maxIdle}"/>