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

interface.ini

@@ -126,6 +126,7 @@ interaction.index.syn_account = "http://interact.int.yidian-inc.com/follow/index
 interaction.index.wechat = "http://interact.int.yidian-inc.com/msg/index/wechat_msg"
 interaction.index.ding = "http://interact.int.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interact.int.yidian-inc.com/msg/index/mini"
+interaction.index.is_send = "http://interact.int.yidian-inc.com/msg/index/is_send"
 
 
 ;======================= 4000000-prod goods微服务接口 ======================= 
@@ -303,6 +304,7 @@ coupon.wxapp.save_share_invite_relation = "http://coupon.int.yidian-inc.com/coup
 coupon.wxapp.get_capital_pool_amount = "http://coupon.int.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
 coupon.wxapp.transfer_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/transfer_coupon" ;微信openid领取的优惠券转移到账号下
 coupon.wxapp.list_newuser_order_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
+coupon.callback.deliver_goods = "http://coupon.int.yidian-inc.com/coupon/callback/deliver_goods" ;确认发货回调
 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" ;订单取消
@@ -441,6 +443,7 @@ interaction.index.syn_account = "http://interaction.test.yidian-inc.com/follow/i
 interaction.index.wechat = "http://interaction.test.yidian-inc.com/msg/index/wechat_msg"
 interaction.index.ding = "http://interaction.test.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interaction.test.yidian-inc.com/msg/index/mini"
+interaction.index.is_send = "http://interaction.test.yidian-inc.com/msg/index/is_send"
 
 
 ;======================= 4000000-test goods微服务接口 ======================= 
@@ -614,6 +617,7 @@ coupon.wxapp.save_share_invite_relation = "http://coupon.test.yidian-inc.com/cou
 coupon.wxapp.get_capital_pool_amount = "http://coupon.test.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
 coupon.wxapp.transfer_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/transfer_coupon" ;微信openid领取的优惠券转移到账号下
 coupon.wxapp.list_newuser_order_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
+coupon.callback.deliver_goods = "http://coupon.test.yidian-inc.com/coupon/callback/deliver_goods" ;确认发货回调
 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" ;订单取消
@@ -714,6 +718,7 @@ interaction.index.syn_account = "http://interaction.dev.yidian-inc.com/follow/in
 interaction.index.wechat = "http://interaction.dev.yidian-inc.com/msg/index/wechat_msg"
 interaction.index.ding = "http://interaction.dev.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interaction.dev.yidian-inc.com/msg/index/mini"
+interaction.index.is_send = "http://interaction.dev.yidian-inc.com/msg/index/is_send"
 
 
 ;======================= 4000000-dev goods微服务接口 ======================= 
@@ -887,7 +892,7 @@ coupon.wxapp.save_share_invite_relation = "http://coupon.dev.yidian-inc.com/coup
 coupon.wxapp.get_capital_pool_amount = "http://coupon.dev.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
 coupon.wxapp.transfer_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/transfer_coupon" ;微信openid领取的优惠券转移到账号下
 coupon.wxapp.list_newuser_order_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
-
+coupon.callback.deliver_goods = "http://coupon.dev.yidian-inc.com/coupon/callback/deliver_goods" ;确认发货回调
 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" ;订单取消

request.ini

@@ -3,15 +3,20 @@
 log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [merchant : common]
 [interaction : common]
+[gateway : common]
 ; 生产环境
 [prod-merchant : merchant : common]
 [prod-interaction : interaction : common]
+[prod-gateway: gateway : common]
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
 
 ;测试测试
 [test-merchant : prod-merchant : merchant : common]
-
+[test-interaction : prod-interaction : interaction : common]
+[test-gateway : prod-gateway : gateway : common]
 ;开发联调测试
 [dev-merchant : prod-merchant : merchant : common]
+[dev-interaction : prod-interaction : interaction : common]
+[dev-gateway : prod-gateway : gateway : common]