From d5b3253e8dd1bf9753f3003e0a1872d8d2cd9792 Mon Sep 17 00:00:00 2001 From: gaojie Date: Fri, 21 Jun 2019 13:39:05 +0800 Subject: [PATCH] fix --- src/main/java/com/ljsd/listener/WebContextListener.java | 6 ++++-- src/main/java/com/ljsd/redis/RedisUtil.java | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ljsd/listener/WebContextListener.java b/src/main/java/com/ljsd/listener/WebContextListener.java index 50bfa98..e47a820 100644 --- a/src/main/java/com/ljsd/listener/WebContextListener.java +++ b/src/main/java/com/ljsd/listener/WebContextListener.java @@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import java.io.FileInputStream; import java.io.InputStream; //创建的类名根据需要定义,但一定要实现ServletContextListener接口 @@ -23,11 +24,12 @@ public class WebContextListener implements ServletContextListener { String osName = System.getProperty("os.name"); if (osName.matches("^(?i)Windows.*$")) {// Window 系统 path = DEFAULT_CONFIG_PATH; + inputStream = getClass().getResourceAsStream(path); }else{ path += "/config/jl_loginserver/application.properties"; + inputStream = new FileInputStream(path); } - - inputStream = getClass().getResourceAsStream(path); + LOGGER.info("WebContextListener==>path={}",path); if (inputStream != null) { BaseGlobal.getInstance().properties.load(inputStream); } diff --git a/src/main/java/com/ljsd/redis/RedisUtil.java b/src/main/java/com/ljsd/redis/RedisUtil.java index 18e167a..dcb58ec 100644 --- a/src/main/java/com/ljsd/redis/RedisUtil.java +++ b/src/main/java/com/ljsd/redis/RedisUtil.java @@ -27,7 +27,11 @@ public class RedisUtil { config.setMaxWaitMillis(Integer.parseInt(properties.getProperty("redis_maxWaitMillis"))); config.setMaxIdle(Integer.parseInt(properties.getProperty("redis_maxIdle"))); config.setTestOnBorrow(Boolean.parseBoolean(properties.getProperty("redis_testOnBorrow"))); - jedisPool = new JedisPool(config, properties.getProperty("redis_host"), Integer.parseInt(properties.getProperty("redis_port")),0,properties.getProperty("redis_password")); + if (properties.getProperty("redis_password") ==null || properties.getProperty("redis_password").isEmpty()){ + jedisPool = new JedisPool(config, properties.getProperty("redis_host"), Integer.parseInt(properties.getProperty("redis_port")),0); + }else{ + jedisPool = new JedisPool(config, properties.getProperty("redis_host"), Integer.parseInt(properties.getProperty("redis_port")),0,properties.getProperty("redis_password")); + } } /***************************************普通键值对操作***************************************/