diff --git a/src/main/java/com/ljsd/listener/WebContextListener.java b/src/main/java/com/ljsd/listener/WebContextListener.java index af6a66e..dbfbcf6 100644 --- a/src/main/java/com/ljsd/listener/WebContextListener.java +++ b/src/main/java/com/ljsd/listener/WebContextListener.java @@ -11,7 +11,7 @@ import java.io.InputStream; //创建的类名根据需要定义,但一定要实现ServletContextListener接口 public class WebContextListener implements ServletContextListener { private static final Logger LOGGER = LoggerFactory.getLogger(ServletContextListener.class); - private static final String DEFAULT_CONFIG_PATH = "/application.properties"; + private static String DEFAULT_CONFIG_PATH = "/application.properties"; @Override public void contextInitialized(ServletContextEvent arg0) { @@ -19,6 +19,10 @@ public class WebContextListener implements ServletContextListener { LOGGER.debug("dddddddddddddddddddddddddddddddd"); InputStream inputStream = null; try { + String osName = System.getProperty("os.name"); + if (!osName.matches("^(?i)Windows.*$")) {// Linux 系统 + DEFAULT_CONFIG_PATH = "../conf/application.properties"; + } inputStream = getClass().getResourceAsStream(DEFAULT_CONFIG_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 f908bd3..18e167a 100644 --- a/src/main/java/com/ljsd/redis/RedisUtil.java +++ b/src/main/java/com/ljsd/redis/RedisUtil.java @@ -27,7 +27,7 @@ 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("jieling666")); + jedisPool = new JedisPool(config, properties.getProperty("redis_host"), Integer.parseInt(properties.getProperty("redis_port")),0,properties.getProperty("redis_password")); } /***************************************普通键值对操作***************************************/ diff --git a/src/main/java/com/ljsd/util/MyMongoDBPool.java b/src/main/java/com/ljsd/util/MyMongoDBPool.java index fe731b5..35a6ca6 100644 --- a/src/main/java/com/ljsd/util/MyMongoDBPool.java +++ b/src/main/java/com/ljsd/util/MyMongoDBPool.java @@ -25,7 +25,7 @@ public class MyMongoDBPool { buide.maxConnectionLifeTime(Integer.parseInt(properties.getProperty("mongodb_maxConnectionLifeTime"))); buide.socketTimeout(Integer.parseInt(properties.getProperty("mongodb_socketTimeout"))); buide.socketKeepAlive(Boolean.parseBoolean(properties.getProperty("mongodb_socketKeepAlive"))); - MongoClientURI mongodb_host = new MongoClientURI(properties.getProperty("mongodb_host"),buide); + MongoClientURI mongodb_host = new MongoClientURI(properties.getProperty("mongodb_url"),buide); mongoClient = new MongoClient(mongodb_host); dbName = properties.getProperty("mongodb_name"); db = mongoClient.getDB(dbName);