Merge branch 'master' of https://git.yidian-inc.com:8021/bp/yaconf

mysql.ini

@@ -8,7 +8,7 @@
 [prod-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
-merchant.connect_timeout=10
+merchant.connect_timeout=2
 merchant.username='bp_merchant_rw'
 merchant.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
 merchant.charset='utf8mb4'
@@ -23,7 +23,7 @@ merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.
 [test-merchant : prod-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
-merchant.connect_timeout=10
+merchant.connect_timeout=2
 merchant.username='bp_test_rw'
 merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 merchant.charset='utf8mb4'
@@ -34,7 +34,7 @@ merchant.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_
 [dev-merchant : prod-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
-merchant.connect_timeout=10
+merchant.connect_timeout=2
 merchant.username='bp_test_rw'
 merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 merchant.charset='utf8mb4'
@@ -46,7 +46,7 @@ merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_
 [prod-interaction : interaction : common]
 interaction.database_type='mysql'
 interaction.database_name='interaction'
-interaction.connect_timeout=10
+interaction.connect_timeout=2
 interaction.username='bp_interaction_rw'
 interaction.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
 interaction.charset='utf8mb4'
@@ -60,7 +60,7 @@ interaction.read.host='10.138.7.57:3306,10.138.7.58:3306'
 [test-interaction : prod-interaction : interaction : common]
 interaction.database_type='mysql'
 interaction.database_name='interaction'
-interaction.connect_timeout=10
+interaction.connect_timeout=2
 interaction.username='bp_test_rw'
 interaction.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 interaction.charset='utf8mb4'
@@ -71,7 +71,7 @@ interaction.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysq
 [dev-interaction : prod-interaction : interaction : common]
 interaction.database_type='mysql'
 interaction.database_name='interaction'
-interaction.connect_timeout=10
+interaction.connect_timeout=2
 interaction.username='bp_test_rw'
 interaction.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 interaction.charset='utf8mb4'
@@ -91,7 +91,7 @@ interaction.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysq
 [test-goods : prod-goods : merchant : common]
 goods.database_type='mysql'
 goods.database_name='goods'
-goods.connect_timeout=10
+goods.connect_timeout=2
 goods.username='bp_test_rw'
 goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 goods.charset='utf8mb4'
@@ -100,7 +100,7 @@ goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.i
 
 distribution.database_type='mysql'
 distribution.database_name='distribution'
-distribution.connect_timeout=10
+distribution.connect_timeout=2
 distribution.username='bp_test_rw'
 distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 distribution.charset='utf8mb4'
@@ -111,7 +111,7 @@ distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mys
 [dev-goods : prod-goods : merchant : common]
 goods.database_type='mysql'
 goods.database_name='goods'
-goods.connect_timeout=10
+goods.connect_timeout=2
 goods.username='bp_test_rw'
 goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 goods.charset='utf8mb4'
@@ -120,7 +120,7 @@ goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.i
 
 distribution.database_type='mysql'
 distribution.database_name='distribution'
-distribution.connect_timeout=10
+distribution.connect_timeout=2
 distribution.username='bp_test_rw'
 distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 distribution.charset='utf8mb4'
@@ -134,7 +134,7 @@ distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mys
 [dev-tcc : prod-tcc : tcc : common]
 tccIndex.database_type='mysql'
 tccIndex.database_name='bp_tcc'
-tccIndex.connect_timeout=10
+tccIndex.connect_timeout=2
 tccIndex.username='bp_test_rw'
 tccIndex.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 tccIndex.charset='utf8'