master
gaojie 2019-06-21 10:12:40 +08:00
parent f8b04b9b89
commit 2cfac32ec7
2 changed files with 6 additions and 8 deletions

View File

@ -19,11 +19,9 @@ public class WebContextListener implements ServletContextListener {
LOGGER.debug("dddddddddddddddddddddddddddddddd"); LOGGER.debug("dddddddddddddddddddddddddddddddd");
InputStream inputStream = null; InputStream inputStream = null;
try { try {
String osName = System.getProperty("os.name"); String path=System.getProperty("catalina.home");
if (!osName.matches("^(?i)Windows.*$")) {// Linux 系统 path += "/config/jl_loginserver/application.properties";
DEFAULT_CONFIG_PATH = "../conf/application.properties"; inputStream = getClass().getResourceAsStream(path);
}
inputStream = getClass().getResourceAsStream(DEFAULT_CONFIG_PATH);
if (inputStream != null) { if (inputStream != null) {
BaseGlobal.getInstance().properties.load(inputStream); BaseGlobal.getInstance().properties.load(inputStream);
} }

View File

@ -1,6 +1,6 @@
#mogodb服务地址 #mogodb服务地址
mongodb_url = mongodb://jieling:jieling666@127.0.0.1:27017/jieling_10048?&authSource=admin mongodb_url = mongodb://jieling:jieling666@60.1.1.14:27017/?&authSource=admin
mongodb_name = jl_core
#与目标数据库可以建立的最大链接数 #与目标数据库可以建立的最大链接数
mongodb_maximumNumberOfConnections = 100 mongodb_maximumNumberOfConnections = 100
#与数据库建立链接的超时时间 2分钟 #与数据库建立链接的超时时间 2分钟
@ -18,7 +18,7 @@ mongodb_socketTimeout = 0
#连接保持活跃 #连接保持活跃
mongodb_socketKeepAlive = true mongodb_socketKeepAlive = true
redis_host = 127.0.0.1 redis_host = 60.1.1.14
redis_port = 6379 redis_port = 6379
redis_password=jieling666 redis_password=jieling666
redis_maxTotal = 10 redis_maxTotal = 10