From 523164127d6eb3c6e4a9112597e87c2aefbe64b9 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 25 Apr 2016 14:00:37 +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

---
 .../main/resources/spring/spring-mongodb-old.xml   | 54 +++++++++++++++
 .../src/main/resources/spring/spring-mongodb.xml   | 79 +++++++++-------------
 platform-resource/resources/config-dev.properties  | 12 +++-
 platform-resource/resources/config-test.properties | 11 +++
 4 files changed, 107 insertions(+), 49 deletions(-)
 create mode 100644 platform-operate-api/src/main/resources/spring/spring-mongodb-old.xml

diff --git a/platform-operate-api/src/main/resources/spring/spring-mongodb-old.xml b/platform-operate-api/src/main/resources/spring/spring-mongodb-old.xml
new file mode 100644
index 0000000..32cd518
--- /dev/null
+++ b/platform-operate-api/src/main/resources/spring/spring-mongodb-old.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo
+          http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd
+          http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+	<mongo:db-factory id="mongoDbFactory" host="${mongo.db.host}"
+		port="${mongo.db.port}" dbname="${mongo.db.dbname}" />
+
+	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />
+		<!-- <constructor-arg name="userCredentials" ref="userCredentials"/> -->
+		<constructor-arg name="mongoConverter" ref="mappingMongoConverter" />
+	</bean>
+
+	<mongo:mapping-converter base-package="com.lyms.platform.pojo" />
+	<bean id="mappingContext" class="org.springframework.data.mongodb.core.mapping.MongoMappingContext" />
+	<!-- 配置mongodb映射类型 -->
+	<bean id="mappingMongoConverter" class="org.springframework.data.mongodb.core.convert.MappingMongoConverter">
+		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />
+		<constructor-arg name="mappingContext" ref="mappingContext" />
+		<property name="typeMapper" ref="defaultMongoTypeMapper" />
+	</bean>
+
+	<!-- 默认Mongodb类型映射 -->
+	<bean id="defaultMongoTypeMapper" class="org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper">
+		<constructor-arg name="typeKey">
+			<null /><!-- 这里设置为空,可以把 spring data mongodb 多余保存的_class字段去掉 -->
+		</constructor-arg>
+	</bean>
+	<!--  
+	<bean id="userCredentials" class="org.springframework.data.authentication.UserCredentials">
+		<description>认证口令</description>
+		<constructor-arg name="username" value="${${mongo.username}}" />
+		<constructor-arg name="password" value="${${mongo.password}}" />
+	</bean>
+
+	<mongo:mongo id="mongo" host="${${mongo.host}}" port="${${mongo.port}}">
+
+		<mongo:options connections-per-host="${${mongo.connectionsPerHost}}"
+
+			threads-allowed-to-block-for-connection-multiplier="${${mongo.threadsAllowedToBlockForConnectionMultiplier}}"
+
+			connect-timeout="${${mongo.connectTimeout}}" max-wait-time="${${mongo.maxWaitTime}}"
+			
+			auto-connect-retry="${${mongo.autoConnectRetry}}" socket-keep-alive="${${mongo.socketKeepAlive}}"
+			
+			socket-timeout="${${mongo.socketTimeout}}" slave-ok="${${mongo.slaveOk}}"
+			
+			write-number="1" write-timeout="0" write-fsync="true" />
+	</mongo:mongo>-->
+</beans>
\ No newline at end of file
diff --git a/platform-operate-api/src/main/resources/spring/spring-mongodb.xml b/platform-operate-api/src/main/resources/spring/spring-mongodb.xml
index 8ac6fbe..82db3b3 100644
--- a/platform-operate-api/src/main/resources/spring/spring-mongodb.xml
+++ b/platform-operate-api/src/main/resources/spring/spring-mongodb.xml
@@ -1,54 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/mongo
           http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd
           http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	<mongo:db-factory id="mongoDbFactory" host="${mongo.db.host}"
-		port="${mongo.db.port}" dbname="${mongo.db.dbname}" />
-
-	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />
-		<!-- <constructor-arg name="userCredentials" ref="userCredentials"/> -->
-		<constructor-arg name="mongoConverter" ref="mappingMongoConverter" />
-	</bean>
-
-	<mongo:mapping-converter base-package="com.lyms.platform.pojo" />
-	<bean id="mappingContext" class="org.springframework.data.mongodb.core.mapping.MongoMappingContext" />
-	<!-- 配置mongodb映射类型 -->
-	<bean id="mappingMongoConverter" class="org.springframework.data.mongodb.core.convert.MappingMongoConverter">
-		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />
-		<constructor-arg name="mappingContext" ref="mappingContext" />
-		<property name="typeMapper" ref="defaultMongoTypeMapper" />
-	</bean>
-
-	<!-- 默认Mongodb类型映射 -->
-	<bean id="defaultMongoTypeMapper" class="org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper">
-		<constructor-arg name="typeKey">
-			<null /><!-- 这里设置为空,可以把 spring data mongodb 多余保存的_class字段去掉 -->
-		</constructor-arg>
-	</bean>
-	<!--  
-	<bean id="userCredentials" class="org.springframework.data.authentication.UserCredentials">
-		<description>认证口令</description>
-		<constructor-arg name="username" value="${${mongo.username}}" />
-		<constructor-arg name="password" value="${${mongo.password}}" />
-	</bean>
-
-	<mongo:mongo id="mongo" host="${${mongo.host}}" port="${${mongo.port}}">
-
-		<mongo:options connections-per-host="${${mongo.connectionsPerHost}}"
-
-			threads-allowed-to-block-for-connection-multiplier="${${mongo.threadsAllowedToBlockForConnectionMultiplier}}"
-
-			connect-timeout="${${mongo.connectTimeout}}" max-wait-time="${${mongo.maxWaitTime}}"
-			
-			auto-connect-retry="${${mongo.autoConnectRetry}}" socket-keep-alive="${${mongo.socketKeepAlive}}"
-			
-			socket-timeout="${${mongo.socketTimeout}}" slave-ok="${${mongo.slaveOk}}"
-			
-			write-number="1" write-timeout="0" write-fsync="true" />
-	</mongo:mongo>-->
+    <bean name="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+        <constructor-arg name="mongo" ref="mongo"/>
+        <constructor-arg name="userCredentials" ref="userCredentials"/>
+        <constructor-arg name="databaseName" value="platform"/>
+    </bean>
+
+
+    <bean id="defaultMongoTypeMapper"
+          class="org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper">
+        <constructor-arg name="typeKey">
+            <null/>
+        </constructor-arg>
+    </bean>
+
+    <bean id="userCredentials" class="org.springframework.data.authentication.UserCredentials">
+        <constructor-arg name="username" value="${mongo.db.username}"/>
+        <constructor-arg name="password" value="${mongo.db.password}"/>
+    </bean>
+
+    <mongo:db-factory mongo-ref="mongo" id="mongoDbFactory"/>
+
+    <mongo:mongo id="mongo" host="${mongo.db.host}" port="${mongo.db.port}">
+        <mongo:options connections-per-host="${mongo.connectionsPerHost}"
+                       threads-allowed-to-block-for-connection-multiplier="${mongo.threadsAllowedToBlockForConnectionMultiplier}"
+                       connect-timeout="${mongo.connectTimeout}" max-wait-time="${mongo.maxWaitTime}"
+                       auto-connect-retry="${mongo.autoConnectRetry}" socket-keep-alive="${mongo.socketKeepAlive}"
+                       socket-timeout="${mongo.socketTimeout}" write-number="1"
+                       write-timeout="0" write-fsync="true"/>
+    </mongo:mongo>
 </beans>
\ No newline at end of file
diff --git a/platform-resource/resources/config-dev.properties b/platform-resource/resources/config-dev.properties
index fddab0c..a93eb8f 100644
--- a/platform-resource/resources/config-dev.properties
+++ b/platform-resource/resources/config-dev.properties
@@ -1,7 +1,15 @@
 mongo.db.host=localhost
 mongo.db.port=27017
-mongo.db.dbname=platform
-
+mongo.db.dbname=platform1
+mongo.db.username=platform
+mongo.db.password=platform123
+mongo.socketTimeout=1000
+mongo.connectionsPerHost=20
+mongo.threadsAllowedToBlockForConnectionMultiplier=10
+mongo.connectTimeout=1000
+mongo.maxWaitTime=2000
+mongo.autoConnectRetry=true
+mongo.socketKeepAlive=true
 
 mysql.db.name=platform
 mysql.db.password=platform123
diff --git a/platform-resource/resources/config-test.properties b/platform-resource/resources/config-test.properties
index 06832c3..7aa63db 100644
--- a/platform-resource/resources/config-test.properties
+++ b/platform-resource/resources/config-test.properties
@@ -2,6 +2,17 @@ mongo.db.host=localhost
 mongo.db.port=10001
 mongo.db.dbname=platform
 
+mongo.db.username=platform
+mongo.db.password=platform123
+mongo.socketTimeout=1000
+mongo.connectionsPerHost=20
+mongo.threadsAllowedToBlockForConnectionMultiplier=10
+mongo.connectTimeout=1000
+mongo.maxWaitTime=2000
+mongo.autoConnectRetry=true
+mongo.socketKeepAlive=true
+
+
 
 mysql.db.name=platform
 mysql.db.password=platform123
-- 
1.8.3.1