From 81d0fc7c7eb4a2f85c3387a31aef1c03839ea005 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 22 Apr 2016 10:18:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-job-index/src/main/webapp/WEB-INF/web.xml         |  5 ++++-
 .../src/main/resources/database.properties                 | 14 +++++++-------
 platform-operate-api/src/main/webapp/WEB-INF/web.xml       |  4 ++++
 platform-resource/resources/config-test.properties         |  9 +++++----
 4 files changed, 20 insertions(+), 12 deletions(-)

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
 		</param-value>
 	</context-param>
-
+	<context-param>
+		<param-name>webAppRootKey</param-name>
+		<param-value>webapp.job.index</param-value>
+	</context-param>
 	<session-config>
 		<session-timeout>60</session-timeout>
 	</session-config>
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 @@
 		<param-value>classpath:log4j_config.xml</param-value>
 	</context-param>
 	<context-param>
+		<param-name>webAppRootKey</param-name>
+		<param-value>webapp.operate</param-value>
+	</context-param>
+	<context-param>
 		<param-name>log4jRefreshInterval</param-name>
 		<param-value>60000</param-value>
 	</context-param>
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
-- 
1.8.3.1