| 
					
				 | 
			
			
				@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import redis.clients.jedis.Jedis; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import redis.clients.jedis.JedisPool; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import redis.clients.jedis.JedisPoolConfig; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import redis.clients.jedis.Protocol; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import redis.clients.jedis.exceptions.JedisException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.io.Serializable; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -43,7 +44,7 @@ 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); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            jedisPool = new JedisPool(config, redisIp, port, 10000, jp.getPassword(), Protocol.DEFAULT_DATABASE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             logger.info("redis连接成功: {}:{}, ", redisIp, port); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } catch (Exception e) { 
			 |