Merge remote-tracking branch 'origin/master'

admin

2019-01-23 324aea6f8b2d36ea5b6fc1b03d29ad8dfae40259

 fanli/src/main/resource/druid.properties

@@ -10,9 +10,9 @@
#druid.password=123456





#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan_test

#druid.username=root

#druid.password=Yeshi2016@

druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan_test

druid.username=root

druid.password=Yeshi2016@





#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan_test_online

@@ -27,9 +27,9 @@
#druid.password=Yeshi2016@



#外网本地测试

druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan_test

druid.username=root

druid.password=Yeshi2016@

#druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan_test

#druid.username=root

#druid.password=Yeshi2016@



druid.initialSize=10

druid.minIdle=6