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

interface.ini

@@ -206,6 +206,8 @@ merchant.lifeaccount.get_account_by_lid = "merchant.test.yidian-inc.com/lifeacco
 
 merchant.lifeaccount.get_account_info = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_info"
 
+merchant.lifeaccount.get_lid_by_uid = "merchant.test.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
+
 ;互动项目
 interaction.index.follow = "interaction.test.yidian-inc.com/follow/index/follow"
 interaction.index.follow_list = "interaction.test.yidian-inc.com/follow/index/follow_list"
@@ -283,6 +285,8 @@ merchant.lifeaccount.get_account_by_lid = "merchant.dev.yidian-inc.com/lifeaccou
 
 merchant.lifeaccount.get_account_info = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info"
 
+merchant.lifeaccount.get_lid_by_uid = "merchant.dev.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
+
 ;互动项目
 interaction.index.follow = "interaction.dev.yidian-inc.com/follow/index/follow"
 interaction.index.follow_list = "interaction.dev.yidian-inc.com/follow/index/follow_list"

mysql.ini

@@ -12,8 +12,8 @@ merchant.connect_timeout=10
 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'
 
 
 ; 预发环境
@@ -50,8 +50,8 @@ interaction.connect_timeout=10
 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]
@@ -110,13 +110,6 @@ 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]
 
@@ -140,4 +133,22 @@ 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
+distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+
+[tcc : common]
+
+[prod-tcc : tcc : common]
+
+[dev-tcc : prod-tcc : tcc : common]
+tccIndex.database_type='mysql'
+tccIndex.database_name='bp_tcc'
+tccIndex.connect_timeout=10
+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