update:处理冲突

interface.ini

@@ -128,6 +128,10 @@ merchant.lifeaccount.get_life_account_by_ids = "http://merchant.int.yidian-inc.c
 merchant.lifeaccount.get_life_account_by_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_name"
 merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_full_name"
 
+merchant.lifeaccount.get_account_info_by_lid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
+merchant.lifeaccount.batch_get_account_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/batch_get_account_name"
+merchant.lifeaccount.update_life_account = "http://merchant.int.yidian-inc.com/lifeaccount/account/update_life_account"
+
 ;互动项目
 interaction.index.follow = "http://interact.int.yidian-inc.com/follow/index/follow"
 interaction.index.follow_list = "http://interact.int.yidian-inc.com/follow/index/follow_list"
@@ -209,10 +213,14 @@ merchant.lifeaccount.get_account_info = "http://merchant.test.yidian-inc.com/lif
 
 merchant.lifeaccount.get_lid_by_uid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
 
+merchant.lifeaccount.get_account_info_by_lid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
+
 merchant.lifeaccount.get_life_account_by_id = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_id"
 merchant.lifeaccount.get_life_account_by_ids = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
 merchant.lifeaccount.get_life_account_by_name = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_name"
 merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_full_name"
+merchant.lifeaccount.batch_get_account_name = "merchant.test.yidian-inc.com/lifeaccount/account/batch_get_account_name"
+merchant.lifeaccount.update_life_account = "merchant.test.yidian-inc.com/lifeaccount/account/update_life_account"
 
 ;互动项目
 interaction.index.follow = "http://interaction.test.yidian-inc.com/follow/index/follow"
@@ -298,6 +306,10 @@ merchant.lifeaccount.get_life_account_by_id = "http://merchant.dev.yidian-inc.co
 merchant.lifeaccount.get_life_account_by_ids = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
 merchant.lifeaccount.get_life_account_by_name = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_name"
 merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_full_name"
+merchant.lifeaccount.get_account_info_by_lid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
+merchant.lifeaccount.batch_get_account_name = "merchant.dev.yidian-inc.com/lifeaccount/account/batch_get_account_name"
+merchant.lifeaccount.update_life_account = "merchant.dev.yidian-inc.com/lifeaccount/account/update_life_account"
+
 
 ;互动项目
 interaction.index.follow = "http://interaction.dev.yidian-inc.com/follow/index/follow"
@@ -337,17 +349,31 @@ goods.consumer.goods_add = "http://goods.dev.yidian-inc.com/goods/goods/add"
 
 
 
-; =======================  merchant ==================================================================================
+; =======================  goods ==================================================================================
 
 [prod-goods : prod]
 [perf-goods : perf : prod-goods]
 [test-goods : test]
 [dev-goods : dev : test-goods]
 
+; =======================  order ==================================================================================
 
+[prod-order : prod]
+[perf-order : perf : prod-order]
+[test-order : test]
+[dev-order : dev : test-order]
 
 
-; =======================  merchant ==================================================================================
+; =======================  pay ==================================================================================
+
+[prod-goods : prod]
+[perf-goods : perf : prod-goods]
+[test-goods : test]
+[dev-goods : dev : test-goods]
+
+
+
+; =======================  interaction ==================================================================================
 
 [prod-interaction : prod]
 merchant.account.get_role_list  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_role_list"

mysql.ini

@@ -20,7 +20,7 @@ merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.
 [perf-merchant : prod-merchant : merchant : common]
 
 ; 测试环境
-[test-merchant : prod-merchant : merchant : common]
+[test-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
 merchant.connect_timeout=2
@@ -31,7 +31,7 @@ merchant.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
 merchant.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 联调环境
-[dev-merchant : prod-merchant : merchant : common]
+[dev-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
 merchant.connect_timeout=2
@@ -50,14 +50,14 @@ 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:3306'
-interaction.read.host='10.138.7.57:3306,10.138.7.58:3306'
+interaction.write.host='w.bp_interaction.int.yidian-inc.com:3306'
+interaction.read.host='r.bp_interaction_1.int.yidian-inc.com:3306,r.bp_interaction_2.int.yidian-inc.com:3306'
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
 
 ; 测试环境
-[test-interaction : prod-interaction : interaction : common]
+[test-interaction : interaction : common]
 interaction.database_type='mysql'
 interaction.database_name='interaction'
 interaction.connect_timeout=2
@@ -68,7 +68,7 @@ interaction.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
 interaction.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 联调环境
-[dev-interaction : prod-interaction : interaction : common]
+[dev-interaction : interaction : common]
 interaction.database_type='mysql'
 interaction.database_name='interaction'
 interaction.connect_timeout=2
@@ -88,7 +88,7 @@ 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]
+[test-goods : merchant : common]
 goods.database_type='mysql'
 goods.database_name='goods'
 goods.connect_timeout=2
@@ -107,8 +107,8 @@ 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]
+; 开发联调测试
+[dev-goods : merchant : common]
 goods.database_type='mysql'
 goods.database_name='goods'
 goods.connect_timeout=2
@@ -142,4 +142,34 @@ 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
+[test-tcc : dev-tcc]
+
+
+[order : common]
+; 生产环境
+[prod-order : order : common]
+
+; 预发环境
+[perf-order : prod-order : order : common]
+
+; 测试环境
+[test-order : order : common]
+order.database_type='mysql'
+order.database_name='order'
+order.connect_timeout=2
+order.username='bp_test_rw'
+order.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+order.charset='utf8mb4'
+order.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+order.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 开发联调测试
+[dev-order : order : common]
+order.database_type='mysql'
+order.database_name='order'
+order.connect_timeout=2
+order.username='bp_test_rw'
+order.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+order.charset='utf8mb4'
+order.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+order.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'

redis.ini

@@ -90,4 +90,34 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
-[pre-interaction : prod-interaction : prod-merchant : merchant : common]
\ No newline at end of file
+[pref-interaction : prod-interaction : prod-merchant : merchant : common]
+
+
+
+
+
+[goods : common]
+
+[prod-goods : goods : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18136/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+ 
+
+[perf-goods : goods : common]
+[test-goods : goods : common]
+;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
+cacheConnect.mode='codis'
+cacheConnect.topom='http://10.126.165.6:18080/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+[dev-goods : test-goods : goods : common]