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

interface.ini

@@ -133,7 +133,7 @@ merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.int.yidian
 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"
-
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 ;互动项目
 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"
@@ -223,7 +223,7 @@ merchant.lifeaccount.get_life_account_by_name = "http://merchant.test.yidian-inc
 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"
-
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 ;互动项目
 interaction.index.follow = "http://interaction.test.yidian-inc.com/follow/index/follow"
 interaction.index.follow_list = "http://interaction.test.yidian-inc.com/follow/index/follow_list"
@@ -232,31 +232,45 @@ interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/di
 interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
 
 ;门店
-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.shop.add_shop = "http://goods.test.int.yidian-inc.com/shop/shop/add_shop"
+goods.shop.get_shop_list = "http://goods.test.int.yidian-inc.com/shop/shop/get_shop_list"
+goods.shop.get_shop_info = "http://goods.test.int.yidian-inc.com/shop/shop/get_shop_info"
+goods.shop.update_shop = "http://goods.test.int.yidian-inc.com/shop/shop/update_shop"
+goods.shop.shop_list = "http://goods.test.int.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"
-goods.marketing.update_marketing = "http://goods.test.yidian-inc.com/marketing/marketing/update_marketing"
-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"
+goods.marketing.marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_list"
+goods.marketing.add_marketing = "http://goods.test.int.yidian-inc.com/marketing/marketing/add_marketing"
+goods.marketing.update_marketing = "http://goods.test.int.yidian-inc.com/marketing/marketing/update_marketing"
+goods.marketing.marketing_info = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_info"
+goods.marketing.marketing_goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/marketing_goods_list"
+goods.marketing.generate_share_goods = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
+goods.marketing.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_list"
 
 
 
 ;团长
-goods.marketing.second_distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/second_distributor_list"
-goods.marketing.apply_distributor = "http://goods.test.yidian-inc.com/marketing/distributor/apply_distributor"
-goods.marketing.apply_second_distributor = "http://goods.test.yidian-inc.com/marketing/distributor/apply_second_distributor"
-goods.marketing.send_sms_code = "http://goods.test.yidian-inc.com/marketing/distributor/send_sms_code"
-goods.marketing.distributor = "http://goods.test.yidian-inc.com/marketing/distributor/distributor"
-goods.marketing.distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_list"
+goods.marketing.second_distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/second_distributor_list"
+goods.marketing.apply_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_distributor"
+goods.marketing.apply_second_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_second_distributor"
+goods.marketing.send_sms_code = "http://goods.test.int.yidian-inc.com/marketing/distributor/send_sms_code"
+goods.marketing.distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor"
+goods.marketing.distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_list"
+
+;商品
+goods.public.get_goods_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_category_list"
+goods.public.goods_edit = "http://goods.test.int.yidian-inc.com/goods/goods/edit"
+goods.public.goods_online_offline = "http://goods.test.int.yidian-inc.com/goods/goods/online_offline"
+goods.public.check_goods_name = "http://goods.test.int.yidian-inc.com/goods/goods/check_goods_name"
 
+goods.background.goods_list_op = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_op"
+goods.background.goods_info_op = "http://goods.test.int.yidian-inc.com/goods/goods/info_op"
+goods.background.goods_audit = "http://goods.test.int.yidian-inc.com/goods/goods/audit"
+
+goods.consumer.goods_list_c = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_c"
+goods.consumer.goods_list_es = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_es"
+goods.consumer.goods_info = "http://goods.test.int.yidian-inc.com/goods/goods/info_fe"
+goods.consumer.goods_add = "http://goods.test.int.yidian-inc.com/goods/goods/add"
 
 ;订单
 order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
@@ -342,7 +356,7 @@ merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.dev.yidian
 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"
-
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 
 ;互动项目
 interaction.index.follow = "http://interaction.dev.yidian-inc.com/follow/index/follow"
@@ -405,7 +419,7 @@ order.order.merchant_order_list = "http://order.dev.yidian-inc.com/order/order/m
 ; =======================  merchant ==================================================================================
 
 [prod-merchant : prod]
-[perf-goods : perf : prod-goods]
+[perf-merchant : perf : prod-merchant]
 [test-merchant : test]
 [dev-merchant : dev : test-merchant]
 
@@ -420,6 +434,7 @@ order.order.merchant_order_list = "http://order.dev.yidian-inc.com/order/order/m
 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"
 
@@ -430,8 +445,8 @@ merchant.lifeaccount.get_life_account_by_ids = "http://merchant.dev.yidian-inc.c
 [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"
+goods.shop.get_shop_list = "http://goods.test.int.yidian-inc.com/shop/shop/get_shop_list"
+goods.public.goods_sku_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_sku_list"
 
 [dev-order : dev : test-order]
 
@@ -456,6 +471,7 @@ merchant.account.get_user_list  = "http://merchant.int.yidian-inc.com/lifeaccoun
 service.jw_user.get_user_dynamic   = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
 service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
 
+[perf-interaction : perf : prod-interaction]
 
 [test-interaction : test]
 merchant.account.get_role_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"