From 510ada3ccff31a61dd85c534f9d3a0abb7a36c20 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 30 十月 2018 18:06:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://yujian@193.112.35.168:29418/fanli-server.git into dev1

---
 fanli/src/main/resource/druid.properties |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/resource/druid.properties b/fanli/src/main/resource/druid.properties
index f1256fb..c5bd22b 100644
--- a/fanli/src/main/resource/druid.properties
+++ b/fanli/src/main/resource/druid.properties
@@ -1,13 +1,25 @@
 druid.driverClassName=com.mysql.jdbc.Driver
-#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan
-druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan
-#druid.url=jdbc:mysql://127.0.0.1:3306/ec_quan
+#鏈湴娴嬭瘯
+druid.url=jdbc:mysql://127.0.0.1:3306/ec_quan
 druid.username=root
-druid.password=Yeshi2016@
+druid.password=hexiaohui
+
+#澶栫綉姝ｅ紡
+#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan
+#druid.username=root
+#druid.password=Yeshi2016@
+
+#澶栫綉鏈湴娴嬭瘯
+#druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan
+#druid.username=root
+#druid.password=Yeshi2016@
+
+
+
 
 
 #druid.username=root
-#druid.password=hexiaohui
+druid.password=hexiaohui
 #Yeshi2016@
 druid.initialSize=10
 druid.minIdle=6

--
Gitblit v1.8.0