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

elasticsearch.ini

+; 公共的配置内容，不区分应用及环境
+[common]
+
+[goods : common]
+
+; 生产环境
+[prod-goods : goods : common]
+
+; 预发环境
+[perf-goods : prod-goods : goods : common]
+
+；测试测试
+[test-goods : prod-goods : goods : common]
+goods.host="http://10.126.154.152:40000"
+
+；开发联调测试
+[dev-goods : prod-goods : goods : common]
+goods.host="http://10.126.154.152:40000"
\ No newline at end of file

mysql.ini

@@ -8,12 +8,12 @@
 [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'
-merchant.write.host='w.bp_merchant.int.yidian-inc.com'
-merchant.read.host='r.bp_merchant_1.int.yidian-inc.com,r.bp_merchant_2.int.yidian-inc.com'
+merchant.write.host='w.bp_merchant.int.yidian-inc.com:3306'
+merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.yidian-inc.com:3306'
 
 
 ; 预发环境
@@ -23,7 +23,7 @@ merchant.read.host='r.bp_merchant_1.int.yidian-inc.com,r.bp_merchant_2.int.yidia
 [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,12 +46,12 @@ 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'
-interaction.write.host='10.138.7.56'
-interaction.read.host='10.138.7.57,10.138.7.58'
+interaction.write.host='10.138.7.56:3306'
+interaction.read.host='10.138.7.57:3306,10.138.7.58:3306'
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
@@ -60,7 +60,7 @@ interaction.read.host='10.138.7.57,10.138.7.58'
 [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'
@@ -87,57 +87,59 @@ interaction.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysq
 ; 预发环境
 [perf-goods : prod-goods : merchant : common]
 
-；测试环境
+; 测试环境
 [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'
 goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
+distribution.database_type='mysql'
+distribution.database_name='distribution'
+distribution.connect_timeout=2
+distribution.username='bp_test_rw'
+distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+distribution.charset='utf8mb4'
+distribution.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
 ；开发联调测试
 [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'
 goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
-
-
-
-[goods : common]
-
-; 生产环境
-[prod-goods : goods : common]
-
-; 预发环境
-[perf-goods : prod-goods : goods : common]
-
-；测试环境
-[test-goods : prod-goods : goods : common]
 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'
 distribution.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
-；开发联调测试
-[dev-goods : prod-goods : goods : common]
-distribution.database_type='mysql'
-distribution.database_name='distribution'
-distribution.connect_timeout=10
-distribution.username='bp_test_rw'
-distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
-distribution.charset='utf8mb4'
-distribution.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
-distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
\ No newline at end of file
+[tcc : common]
+
+[prod-tcc : tcc : common]
+
+[dev-tcc : prod-tcc : tcc : common]
+tccIndex.database_type='mysql'
+tccIndex.database_name='bp_tcc'
+tccIndex.connect_timeout=2
+tccIndex.username='bp_test_rw'
+tccIndex.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+tccIndex.charset='utf8'
+tccIndex.write.host='w.bp_test_mysql5.int.yidian-inc.com:3310'
+tccIndex.read.host[]='r.bp_test_mysql5_1.int.yidian-inc.com:3310'
+tccIndex.read.host[]='r.bp_test_mysql5_2.int.yidian-inc.com:3310'
+
+[test-tcc : dev-tcc]
\ No newline at end of file