diff --git a/platform-job-index/src/main/webapp/WEB-INF/web.xml b/platform-job-index/src/main/webapp/WEB-INF/web.xml index e208829..929b3a3 100644 --- a/platform-job-index/src/main/webapp/WEB-INF/web.xml +++ b/platform-job-index/src/main/webapp/WEB-INF/web.xml @@ -18,7 +18,10 @@ classpath*:/spring/applicationContext.xml - + + webAppRootKey + webapp.job.index + 60 diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties index b821e6e..84d8cbc 100644 --- a/platform-operate-api/src/main/resources/database.properties +++ b/platform-operate-api/src/main/resources/database.properties @@ -2,9 +2,9 @@ #mongo.db.port=27017 #mongo.db.dbname=platform -mongo.db.host=192.168.5.223 -mongo.db.port=27017 -mongo.db.dbname=platform +mongo.db.host=${mongo.db.host} +mongo.db.port=${mongo.db.port} +mongo.db.dbname=${mongo.db.dbname} mongo.db.username=root mongo.db.password=root @@ -27,15 +27,15 @@ mongo.dbname=platform maindata.driver=com.mysql.jdbc.Driver -maindata.jdbcurl=jdbc:mysql://192.168.5.250:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 -maindata.username=platform -maindata.password=platform123 +maindata.jdbcurl=${mysql.jdbcurl} +maindata.username=${mysql.db.name} +maindata.password=${mysql.db.password} maindata.maxpoolsize=5 maindata.initialpoolsize=2 maindata.minpoolsize=2 -redis.servers=192.168.5.250:6379:mommybaby123 +redis.servers=${redis.servers} token.prefix=member diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml b/platform-operate-api/src/main/webapp/WEB-INF/web.xml index e208829..a0add13 100644 --- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml @@ -27,6 +27,10 @@ classpath:log4j_config.xml + webAppRootKey + webapp.operate + + log4jRefreshInterval 60000 diff --git a/platform-resource/resources/config-test.properties b/platform-resource/resources/config-test.properties index ce1c789..1ac363d 100644 --- a/platform-resource/resources/config-test.properties +++ b/platform-resource/resources/config-test.properties @@ -1,13 +1,14 @@ mongo.db.host=localhost -mongo.db.port=27017 -mongo.db.dbname=dev_mongo +mongo.db.port=10001 +mongo.db.dbname=platform mysql.db.name=test mysql.db.password=test mysql.driver=com.mysql.jdbc.Driver -mysql.jdbcurl=jdbc:mysql://192.168.5.250:3306/mommybaby?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 +mysql.jdbcurl=jdbc:mysql://localhost:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 mysql.maxpoolsize=5 mysql.initialpoolsize=2 -mysql.minpoolsize=2 \ No newline at end of file +mysql.minpoolsize=2 +redis.servers=localhost:6379 \ No newline at end of file