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

interface.ini

@@ -27,6 +27,13 @@ service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount
 ;idgen发号器
 service.idgen = "http://idgen.int.yidian-inc.com/id/get"
 
+
+;TCC事务协调器
+service.tcc.try = "http://tcc.int.yidian-inc.com/tcc/try"
+service.tcc.confirm = "http://tcc.int.yidian-inc.com/tcc/confirm"
+service.tcc.cancel = "http://tcc.int.yidian-inc.com/tcc/cancel"
+
+
 [perf : prod : common]
 
 
@@ -53,8 +60,14 @@ service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount
 ;idgen发号器
 service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
 
+;TCC事务协调器
+service.tcc.try = "http://tcc.test.yidian-inc.com/tcc/try"
+service.tcc.confirm = "http://tcc.test.yidian-inc.com/tcc/confirm"
+service.tcc.cancel = "http://tcc.test.yidian-inc.com/tcc/cancel"
+
 [dev : test : common]
 
+
 ; =======================  gateway ==================================================================================
 
 [prod-gateway : prod]
@@ -263,6 +276,7 @@ goods.marketing.distributor_code_url = "http://goods.test.yidian-inc.com/marketi
 
 ;商品
 goods.public.get_goods_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_category_list"
+goods.public.get_level_one_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_level_one_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"
@@ -402,6 +416,7 @@ goods.marketing.distributor_code_url = "http://goods.dev.yidian-inc.com/marketin
 
 ;商品
 goods.public.get_goods_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_category_list"
+goods.public.get_level_one_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_level_one_category_list"
 goods.public.goods_edit = "http://goods.dev.yidian-inc.com/goods/goods/edit"
 goods.public.goods_online_offline = "http://goods.dev.yidian-inc.com/goods/goods/online_offline"
 goods.public.check_goods_name = "http://goods.dev.yidian-inc.com/goods/goods/check_goods_name"
@@ -453,11 +468,37 @@ merchant.lifeaccount.get_life_account_by_ids = "http://merchant.dev.yidian-inc.c
 
 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"
+goods.public.goods_spu_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_spu_list"
+
+;tcc调goods用子项目
+goods.tcc.place_an_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_try";
+goods.tcc.place_an_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_confirm";
+goods.tcc.place_an_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_cancel";
+goods.tcc.cancel_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_try";
+goods.tcc.cancel_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_confirm";
+goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_cancel";
+
+;生活号
+merchant.lifeaccount.get_life_account_by_ids = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
 
 [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"
+goods.public.goods_spu_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_spu_list"
+
+;tcc调goods用子项目
+goods.tcc.place_an_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_try";
+goods.tcc.place_an_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_confirm";
+goods.tcc.place_an_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_cancel";
+goods.tcc.cancel_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_try";
+goods.tcc.cancel_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_confirm";
+goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_cancel";
+
+;生活号
+merchant.lifeaccount.get_life_account_by_ids = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
+
+
 
 ; =======================  pay ==================================================================================