Commit 524c92ee authored by jianghaiming's avatar jianghaiming

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

parents c5535458 bb27b523
......@@ -283,6 +283,7 @@ goods.consumer.goods_list_c = "http://goods.test.int.yidian-inc.com/goods/goods/
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"
goods.consumer.pay_success_callback = "http://goods.test.int.yidian-inc.com/goods/goods/pay_success_callback"
goods.consumer.init_shop = "http://goods.test.int.yidian-inc.com/goods/goods/init_shop"
goods.public.goods_sku_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_sku_list"
......@@ -471,6 +472,7 @@ goods.consumer.goods_list_c = "http://goods.dev.yidian-inc.com/goods/goods/goods
goods.consumer.goods_list_es = "http://goods.dev.yidian-inc.com/goods/goods/goods_list_es"
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"
goods.consumer.pay_success_callback = "http://goods.dev.yidian-inc.com/goods/goods/pay_success_callback"
goods.consumer.init_shop = "http://goods.dev.yidian-inc.com/goods/goods/init_shop"
goods.public.goods_sku_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_sku_list"
......@@ -576,7 +578,6 @@ order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_or
merchant.account.get_role_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_user_list"
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]
......@@ -585,12 +586,10 @@ service.jw_user.get_user_digg = "http://testblend.jwshq.cn/ydInner/getUserAgre
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"
merchant.account.get_user_list = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_user_list"
service.jw_user.get_user_dynamic = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
service.jw_user.get_user_digg = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
[dev-interaction : dev]
merchant.account.get_role_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_user_list"
service.jw_user.get_user_dynamic = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
service.jw_user.get_user_digg = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment