From 349fe3ad7dc7295729f5ef98aabd7c3c68a90ce6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 27 六月 2019 17:49:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/resource/env-dev/mongo.properties b/fanli/src/main/resource/env-dev/mongo.properties
index 9764201..fd6be62 100644
--- a/fanli/src/main/resource/env-dev/mongo.properties
+++ b/fanli/src/main/resource/env-dev/mongo.properties
@@ -1,14 +1,17 @@
 mongo.dbname=flq
-mongo.port=27017
+mongo.port=27016
 
 #寮�鍙戠幆澧�
-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.connectionsPerHost=8
 mongo.threadsAllowedToBlockForConnectionMultiplier=4
-mongo.connectTimeout=1000
+mongo.connectTimeout=10000
 mongo.maxWaitTime=1500
 mongo.autoConnectRetry=true
 mongo.socketKeepAlive=true

--
Gitblit v1.8.0