update:处理冲突

interface.ini

@@ -234,10 +234,10 @@ interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.c
 ;门店
 goods.shop.add_shop = "http://goods.test.yidian-inc.com/shop/shop/add_shop"
 goods.shop.get_shop_list = "http://goods.test.yidian-inc.com/shop/shop/get_shop_list"
+goods.shop.get_shop_info = "http://goods.test.yidian-inc.com/shop/shop/get_shop_info"
 goods.shop.update_shop = "http://goods.test.yidian-inc.com/shop/shop/update_shop"
 goods.shop.shop_list = "http://goods.test.yidian-inc.com/shop/shop/shop_list"
 
-
 ;分销活动
 goods.marketing.marketing_list = "http://goods.test.yidian-inc.com/marketing/marketing/marketing_list"
 goods.marketing.add_marketing = "http://goods.test.yidian-inc.com/marketing/marketing/add_marketing"
@@ -245,6 +245,8 @@ goods.marketing.update_marketing = "http://goods.test.yidian-inc.com/marketing/m
 goods.marketing.marketing_info = "http://goods.test.yidian-inc.com/marketing/marketing/marketing_info"
 goods.marketing.marketing_goods_list = "http://goods.test.yidian-inc.com/marketing/marketinggoods/marketing_goods_list"
 goods.marketing.generate_share_goods = "http://goods.test.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
+goods.marketing.goods_list = "http://goods.test.yidian-inc.com/marketing/marketing/marketing_goods_list"
+
 
 
 ;团长
@@ -256,6 +258,11 @@ goods.marketing.distributor = "http://goods.test.yidian-inc.com/marketing/distri
 goods.marketing.distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_list"
 
 
+;订单
+order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
+order.order.merchant_order_list = "http://order.test.yidian-inc.com/order/order/merchant_order_list"
+
+
 
 
 [dev-gateway : dev]
@@ -347,6 +354,7 @@ interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.co
 ;门店
 goods.shop.add_shop = "http://goods.dev.yidian-inc.com/shop/shop/add_shop"
 goods.shop.get_shop_list = "http://goods.dev.yidian-inc.com/shop/shop/get_shop_list"
+goods.shop.get_shop_info = "http://goods.dev.yidian-inc.com/shop/shop/get_shop_info"
 goods.shop.update_shop = "http://goods.dev.yidian-inc.com/shop/shop/update_shop"
 goods.shop.shop_list = "http://goods.dev.yidian-inc.com/shop/shop/shop_list"
 
@@ -359,6 +367,7 @@ goods.marketing.update_marketing = "http://goods.dev.yidian-inc.com/marketing/ma
 goods.marketing.marketing_info = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_info"
 goods.marketing.marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/marketing_goods_list"
 goods.marketing.generate_share_goods = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
+goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_list"
 
 
 
@@ -388,6 +397,10 @@ goods.consumer.goods_info = "http://goods.dev.yidian-inc.com/goods/goods/info_fe
 goods.consumer.goods_add = "http://goods.dev.yidian-inc.com/goods/goods/add"
 
 
+;订单
+order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
+order.order.merchant_order_list = "http://order.dev.yidian-inc.com/order/order/merchant_order_list"
+
 
 ; =======================  merchant ==================================================================================
 
@@ -403,16 +416,28 @@ goods.consumer.goods_add = "http://goods.dev.yidian-inc.com/goods/goods/add"
 [prod-goods : prod]
 [perf-goods : perf : prod-goods]
 [test-goods : test]
+
+merchant.lifeaccount.get_life_account_by_ids = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
+
 [dev-goods : dev : test-goods]
 goods.public.get_life_account_by_id = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_id"
 
+merchant.lifeaccount.get_life_account_by_ids = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
+
+
 ; =======================  order ==================================================================================
 
 [prod-order : prod]
 [perf-order : perf : prod-order]
 [test-order : test]
+
+goods.shop.get_shop_list = "http://goods.test.yidian-inc.com/shop/shop/get_shop_list"
+goods.public.goods_sku_list = "http://goods.test.yidian-inc.com/goods/goods/goods_sku_list"
+
 [dev-order : dev : test-order]
 
+goods.shop.get_shop_list = "http://goods.dev.yidian-inc.com/shop/shop/get_shop_list"
+goods.public.goods_sku_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_sku_list"
 
 ; =======================  pay ==================================================================================
 
@@ -434,7 +459,6 @@ service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgre
 
 [perf-interaction : perf : prod-interaction]
 
-
 [test-interaction : test]
 merchant.account.get_role_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
 merchant.account.get_life_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_list"

xhprof.ini

 [common]
+# 对应的域名是否使用当前域名作为 collection 1：开启，0:不开启
+collection.bp_test_go2yd_com = 1
 
-domain.bp_test_go2yd_com = 1
-domain.localhost         = 1
-
-
-[test-gateway : common]
+#是否开启xhprof, 按照域名来开启， 值为开启的百分比
+switch.bp_test_go2yd_com = 100
\ No newline at end of file