From e8e2e233af733ca3ba625223e2fd2255165e6b70 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 02 四月 2020 16:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/resource/env-dev/mongo.properties |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/resource/env-dev/mongo.properties b/fanli/src/main/resource/env-dev/mongo.properties
index bd7b458..2947019 100644
--- a/fanli/src/main/resource/env-dev/mongo.properties
+++ b/fanli/src/main/resource/env-dev/mongo.properties
@@ -1,21 +1,21 @@
-mongo.dbname=flq-wxmp
-mongo.port=27016
+mongo.dbname=flq
+mongo.port=27017
 #寮�鍙戠幆澧�
-#mongo.host=192.168.1.253
-#mongo.username=admin
-#mongo.password=123456
+mongo.host=192.168.1.253
+mongo.username=admin
+mongo.password=123456
 
-mongo.host=193.112.35.168
-mongo.username=yeshi
-mongo.password=Yeshi2016@
+#mongo.host=193.112.35.168
+#mongo.username=yeshi
+#mongo.password=Yeshi2016@
 
 mongo.connectionsPerHost=8
 mongo.threadsAllowedToBlockForConnectionMultiplier=4
 mongo.connectTimeout=10000
-mongo.maxWaitTime=1500
+mongo.maxWaitTime=15000
 mongo.autoConnectRetry=true
 mongo.socketKeepAlive=true
-mongo.socketTimeout=1500
+mongo.socketTimeout=15000
 mongo.slaveOk=true
 mongo.writeNumber=1
 mongo.riteTimeout=0

--
Gitblit v1.8.0