Skip to content

Y
yaconf
Commit 05b2858c authored by 耿鸿飞's avatar 耿鸿飞
Browse files
Options

update:mergemaster

parents 19d74e40 311aaed5
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 3 deletions
interface.ini
View file @ 05b2858c
...@@ -225,7 +225,7 @@ order.order.order_pay_callback = "http://order.int.yidian-inc.com/order/order/or ...@@ -225,7 +225,7 @@ order.order.order_pay_callback = "http://order.int.yidian-inc.com/order/order/or
order.order.order_refund_callback = "http://order.int.yidian-inc.com/order/order/order_refund_callback" order.order.order_refund_callback = "http://order.int.yidian-inc.com/order/order/order_refund_callback"
order.order.order_info = "http://order.int.yidian-inc.com/order/order/order_info" order.order.order_info = "http://order.int.yidian-inc.com/order/order/order_info"
order.order.my_order_record = "http://order.int.yidian-inc.com/order/order/my_order_record" order.order.my_order_record = "http://order.int.yidian-inc.com/order/order/my_order_record"
order.user.is_new_user = "http://order.int.yidian-inc.com/order/order/is_new_user"
;订单后台 ;订单后台
order.order.old_order_list = "http://order.int.yidian-inc.com/order/order/old_order_list" order.order.old_order_list = "http://order.int.yidian-inc.com/order/order/old_order_list"
...@@ -291,7 +291,9 @@ coupon.wxapp.list_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/list" ...@@ -291,7 +291,9 @@ coupon.wxapp.list_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/list"
coupon.wxapp.save_share_invite_relation = "http://coupon.int.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系 coupon.wxapp.save_share_invite_relation = "http://coupon.int.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
coupon.wxapp.get_capital_pool_amount = "http://coupon.int.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额 coupon.wxapp.get_capital_pool_amount = "http://coupon.int.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
coupon.wxapp.list_newuser_order_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表 coupon.wxapp.list_newuser_order_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
coupon.callback.pay = "http://coupon.int.yidian-inc.com/coupon/callback/pay" ;支付成功回调
coupon.callback.refund = "http://coupon.int.yidian-inc.com/coupon/callback/refund" ;退款成功回调
coupon.background.cancel = "http://coupon.int.yidian-inc.com/coupon/background/cancel" ;订单取消
[perf : prod : common] [perf : prod : common]
...@@ -515,6 +517,7 @@ order.order.order_pay_callback = "http://order.test.yidian-inc.com/order/order/o ...@@ -515,6 +517,7 @@ order.order.order_pay_callback = "http://order.test.yidian-inc.com/order/order/o
order.order.order_refund_callback = "http://order.test.yidian-inc.com/order/order/order_refund_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" order.order.order_info = "http://order.test.yidian-inc.com/order/order/order_info"
order.order.my_order_record = "http://order.test.yidian-inc.com/order/order/my_order_record" order.order.my_order_record = "http://order.test.yidian-inc.com/order/order/my_order_record"
order.user.is_new_user = "http://order.test.yidian-inc.com/order/order/is_new_user"
;订单后台 ;订单后台
order.order.old_order_list = "http://order.test.yidian-inc.com/order/order/old_order_list" order.order.old_order_list = "http://order.test.yidian-inc.com/order/order/old_order_list"
...@@ -574,12 +577,15 @@ wallet.withdrawbackground.apply_detail = "http://wallet.test.yidian-inc.com/wall ...@@ -574,12 +577,15 @@ wallet.withdrawbackground.apply_detail = "http://wallet.test.yidian-inc.com/wall
wallet.withdrawbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/record_list" wallet.withdrawbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/record_list"
wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage" wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
;======================== 9000000-dev coupon 微服务接口 ============================== ;======================== 9000000-dev coupon 微服务接口 ==============================<<<<<<< HEAD
coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
coupon.wxapp.list_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list" ;优惠券列表 coupon.wxapp.list_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
coupon.wxapp.save_share_invite_relation = "http://coupon.test.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系 coupon.wxapp.save_share_invite_relation = "http://coupon.test.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
coupon.wxapp.get_capital_pool_amount = "http://coupon.test.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额 coupon.wxapp.get_capital_pool_amount = "http://coupon.test.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
coupon.wxapp.list_newuser_order_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表 coupon.wxapp.list_newuser_order_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
coupon.callback.pay = "http://coupon.test.yidian-inc.com/coupon/callback/pay" ;支付成功回调
coupon.callback.refund = "http://coupon.test.yidian-inc.com/coupon/callback/refund" ;退款成功回调
coupon.background.cancel = "http://coupon.test.yidian-inc.com/coupon/background/cancel" ;订单取消
[dev : test : common] [dev : test : common]
...@@ -767,6 +773,7 @@ order.order.order_pay_callback = "http://order.dev.yidian-inc.com/order/order/or ...@@ -767,6 +773,7 @@ order.order.order_pay_callback = "http://order.dev.yidian-inc.com/order/order/or
order.order.order_refund_callback = "http://order.dev.yidian-inc.com/order/order/order_refund_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" order.order.order_info = "http://order.dev.yidian-inc.com/order/order/order_info"
order.order.my_order_record = "http://order.dev.yidian-inc.com/order/order/my_order_record" order.order.my_order_record = "http://order.dev.yidian-inc.com/order/order/my_order_record"
order.user.is_new_user = "http://order.dev.yidian-inc.com/order/order/is_new_user"
;订单后台 ;订单后台
order.order.old_order_list = "http://order.dev.yidian-inc.com/order/order/old_order_list" order.order.old_order_list = "http://order.dev.yidian-inc.com/order/order/old_order_list"
...@@ -826,12 +833,16 @@ wallet.withdrawbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet ...@@ -826,12 +833,16 @@ wallet.withdrawbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet
wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage" wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
;======================== 9000000-dev coupon 微服务接口 ============================== ;======================== 9000000-dev coupon 微服务接口 ==============================
coupon.wxapp.apply_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券 coupon.wxapp.apply_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
coupon.wxapp.list_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list" ;优惠券列表 coupon.wxapp.list_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
coupon.wxapp.save_share_invite_relation = "http://coupon.dev.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系 coupon.wxapp.save_share_invite_relation = "http://coupon.dev.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
coupon.wxapp.get_capital_pool_amount = "http://coupon.dev.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额 coupon.wxapp.get_capital_pool_amount = "http://coupon.dev.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
coupon.wxapp.list_newuser_order_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表 coupon.wxapp.list_newuser_order_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
coupon.callback.pay = "http://coupon.dev.yidian-inc.com/coupon/callback/pay" ;支付成功回调
coupon.callback.refund = "http://coupon.dev.yidian-inc.com/coupon/callback/refund" ;退款成功回调
coupon.background.cancel = "http://coupon.dev.yidian-inc.com/coupon/background/cancel" ;订单取消
; ======================= gateway ================================================================================== ; ======================= gateway ==================================================================================
[prod-gateway : prod] [prod-gateway : prod]
......
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