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

dictionary

-[trade_type]

interface.ini

@@ -18,13 +18,14 @@ 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"
+service.jw_user.get_user_digg   = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
 
 ;idgen发号器
 service.idgen = "http://idgen.int.yidian-inc.com/id/get"
@@ -115,6 +116,10 @@ interaction.index.follow_list = "http://interact.int.yidian-inc.com/follow/index
 interaction.index.is_follow = "http://interact.int.yidian-inc.com/follow/index/is_follow"
 interaction.inner.digg = "http://interact.int.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interact.int.yidian-inc.com/follow/index/get_count_and_isfollow"
+;互动调用生活号
+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"
 
 
 [perf : prod : common]
@@ -140,6 +145,7 @@ service.jw_user.get_user_info_by_user_id   = "http://blend-test.api.appgc.yidian
 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"
+service.jw_user.get_user_digg   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
 
 
 
@@ -235,6 +241,10 @@ interaction.index.follow_list = "http://interaction.test.yidian-inc.com/follow/i
 interaction.index.is_follow = "http://interaction.test.yidian-inc.com/follow/index/is_follow"
 interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
+;互动调用生活号
+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"
 
 ;门店
 goods.shop.add_shop = "http://goods.test.int.yidian-inc.com/shop/shop/add_shop"
@@ -315,8 +325,14 @@ pay.callback.refund = "http://pay.test.yidian-inc.com/pay/callback/refund"
 
 ;钱包
 wallet.account.transfer = "http://wallet.test.yidian-inc.com/wallet/account/transfer"
+wallet.account.withdraw = "http://wallet.test.yidian-inc.com/wallet/account/withdraw"
 wallet.account.list = "http://wallet.test.yidian-inc.com/wallet/account/list"
 wallet.account.account_info = "http://wallet.test.yidian-inc.com/wallet/account/account_info"
+wallet.account.third_account_bind = "http://wallet.test.yidian-inc.com/wallet/account/third_account_bind"
+wallet.account.third_account = "http://wallet.test.yidian-inc.com/wallet/account/third_account"
+wallet.account.withdraw_validate = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_validate"
+wallet.account.withdraw_detail = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_detail"
+wallet.account.pingpp_callback = "http://wallet.test.yidian-inc.com/wallet/account/pingpp_callback"
 
 
 ;tcc调goods用子项目
@@ -422,6 +438,10 @@ interaction.index.follow_list = "http://interaction.dev.yidian-inc.com/follow/in
 interaction.index.is_follow = "http://interaction.dev.yidian-inc.com/follow/index/is_follow"
 interaction.inner.digg = "http://interaction.dev.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.com/follow/index/get_count_and_isfollow"
+;互动调用生活号
+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"
 
 ;门店
 goods.shop.add_shop = "http://goods.dev.yidian-inc.com/shop/shop/add_shop"
@@ -504,8 +524,14 @@ pay.callback.refund = "http://pay.dev.yidian-inc.com/pay/callback/refund"
 
 ;钱包
 wallet.account.transfer = "http://wallet.dev.yidian-inc.com/wallet/account/transfer"
+wallet.account.withdraw = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw"
 wallet.account.list = "http://wallet.dev.yidian-inc.com/wallet/account/list"
 wallet.account.account_info = "http://wallet.dev.yidian-inc.com/wallet/account/account_info"
+wallet.account.third_account_bind = "http://wallet.dev.yidian-inc.com/wallet/account/third_account_bind"
+wallet.account.third_account = "http://wallet.dev.yidian-inc.com/wallet/account/third_account"
+wallet.account.withdraw_validate = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_validate"
+wallet.account.withdraw_detail = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_detail"
+wallet.account.pingpp_callback = "http://wallet.dev.yidian-inc.com/wallet/account/pingpp_callback"
 
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_try";
@@ -575,21 +601,7 @@ order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_or
 ; =======================  interaction ==================================================================================
 
 [prod-interaction : prod]
-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_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
-
 [perf-interaction : perf]
-
 [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"
-merchant.account.get_user_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_user_list"
-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_digg   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
+

pay.ini

+[common]
+;支付订单有效时长
+pay.expire_time         = 1800;
+pay.wechat_rate         = 60;
+pay.wechat_account_id   = 10010;