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

interface.ini

@@ -288,8 +288,12 @@ wallet.withdrawbackground.record_list = "http://wallet.int.yidian-inc.com/wallet
 wallet.historyapi.sendmsg = "https://ex.jwshq.cn/app/msg/sendMessage"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
-coupon.wxapp.apply = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
-coupon.wxapp.list = "http://coupon.int.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
+coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
+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.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.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" ;订单取消
@@ -581,8 +585,12 @@ wallet.withdrawbackground.record_list = "http://wallet.test.yidian-inc.com/walle
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
-coupon.wxapp.apply = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
-coupon.wxapp.list = "http://coupon.test.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
+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.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.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.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" ;订单取消
@@ -836,8 +844,14 @@ wallet.withdrawbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
-coupon.wxapp.apply = "http://coupon.dev.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
-coupon.wxapp.list = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
+
+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.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.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.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" ;订单取消

mysql.ini

@@ -67,11 +67,10 @@ merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.
 dao.database_type='mysql'
 dao.database_name='zhiyue'
 dao.connect_timeout=2
-dao.username='zhiyue_tmp_ro'
-dao.password='AABBCCDD'
+dao.username='data'
+dao.password='s5JEh#FUvX%7P3sO9ZDQw&cpH$Xr8Q'
 dao.charset='utf8mb4'
-;marketing.write.host='10.126.155.120:3306'
-dao.read.host='10.136.150.2:3307'
+dao.read.host='10.9.102.116:4066'
 
 ;导数据专用--线上
 fu.database_type='mysql'
@@ -81,7 +80,6 @@ fu.username='zhiyue_tmp_ro'
 fu.password='AABBCCDD'
 fu.charset='utf8mb4'
 fu.write.host='10.136.150.2:3307'
-;marketing.write.host='10.126.155.120:3306'
 fu.read.host='10.136.150.2:3307'
 
 ; 预发环境

request.ini

@@ -2,9 +2,10 @@
 [common]
 log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [merchant : common]
-
+[interaction : common]
 ; 生产环境
 [prod-merchant : merchant : common]
+[prod-interaction : interaction : common]
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]