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

interface.ini

@@ -18,13 +18,13 @@ service.session.set             = "http://a4.go2yd.com/Website/session/set-sessi
 service.session.delete          = "http://a4.go2yd.com/Website/session/delete-session"
 service.session.mget            = "http://a4.go2yd.com/Website/session/get-many-session"
 
-;简网用户信息,目前测试域名，后期换成生产内网域名！！！
-service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
-service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
-service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
-service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
-service.jw_user.save_push_token = "http://testblend.jwshq.cn/ydInnerToken/savePushToken"
-service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount/saveOrUpdateLifeAccount"
+;简网用户信息
+service.jw_user.get_user_info       = "http://blend.jwshq.yidian-inc.com/ydInner/getUserInfoByMobile"
+service.jw_user.get_all_city_tree   = "http://blend.jwshq.yidian-inc.com/ydInner/getAllCityTree"
+service.jw_user.get_user_info_by_user_id   = "http://blend.jwshq.yidian-inc.com/ydInner/getUserInfoByUserId"
+service.jw_user.get_user_list   = "http://blend.jwshq.yidian-inc.com/ydInner/getUserList"
+service.jw_user.save_push_token = "http://blend.jwshq.yidian-inc.com/ydInnerToken/savePushToken"
+service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
 
 ;idgen发号器
 service.idgen = "http://idgen.int.yidian-inc.com/id/get"
@@ -134,12 +134,14 @@ service.session.delete          = "http://a4-1.go2yd.com/Website/session/delete-
 service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-many-session"
 
 ;简网用户信息
-service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
-service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
-service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
-service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
-service.jw_user.save_push_token = "http://testblend.jwshq.cn/ydInnerToken/savePushToken"
-service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount/saveOrUpdateLifeAccount"
+service.jw_user.get_user_info       = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserInfoByMobile"
+service.jw_user.get_all_city_tree   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getAllCityTree"
+service.jw_user.get_user_info_by_user_id   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserInfoByUserId"
+service.jw_user.get_user_list   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserList"
+service.jw_user.save_push_token = "http://blend-test.api.appgc.yidian-inc.com/ydInnerToken/savePushToken"
+service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
+
+
 
 ;idgen发号器
 service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
@@ -281,6 +283,8 @@ 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"
 goods.public.goods_spu_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_spu_list"
@@ -299,6 +303,7 @@ order.order.pay_order_info = "http://order.test.yidian-inc.com/order/order/pay_o
 order.order.scanpurchase_userverify = "http://order.test.yidian-inc.com/order/order/scanpurchase_userverify"
 order.order.order_pay_callback = "http://order.test.yidian-inc.com/order/order/order_pay_callback"
 order.order.order_refund_callback = "http://order.test.yidian-inc.com/order/order/order_refund_callback"
+order.order.order_info = "http://order.test.yidian-inc.com/order/order/order_info"
 
 
 ;支付
@@ -467,6 +472,8 @@ 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"
 goods.public.goods_spu_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_spu_list"
@@ -484,7 +491,7 @@ order.order.pay_order_info = "http://order.dev.yidian-inc.com/order/order/pay_or
 order.order.scanpurchase_userverify = "http://order.dev.yidian-inc.com/order/order/scanpurchase_userverify"
 order.order.order_pay_callback = "http://order.dev.yidian-inc.com/order/order/order_pay_callback"
 order.order.order_refund_callback = "http://order.dev.yidian-inc.com/order/order/order_refund_callback"
-
+order.order.order_info = "http://order.dev.yidian-inc.com/order/order/order_info"
 
 
 
@@ -571,8 +578,7 @@ 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"
+service.jw_user.get_user_digg   = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
 
 [perf-interaction : perf]
 
@@ -580,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"