merge master

interface.ini

@@ -31,6 +31,8 @@ service.jw_user.get_wechat_openid = "http://blend.jwshq.yidian-inc.com/ydInner/g
 
 service.jw_order.refund = "https://api.jwshq.cn/api/wx/hulk/order/refundByManager"
 service.jw_order.reject = "https://api.jwshq.cn/api/wx/hulk/order/rejectRefundByBuyer"
+service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
+
 
 ;Switch开关按钮域名
 service.switch.api = "http://api.jwshq.cn/"
@@ -416,7 +418,7 @@ interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.c
 interaction.index.syn_account = "http://interaction.test.yidian-inc.com/follow/index/syn_account"
 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.is_subscribe = "http://interact.test.yidian-inc.com/msg/index/is_send"
+interaction.index.mini = "http://interaction.test.yidian-inc.com/msg/index/mini"
 
 
 ;======================= 4000000-test goods微服务接口 ======================= 
@@ -483,11 +485,13 @@ goods.public.goods_spu_shop_list = "http://goods.test.int.yidian-inc.com/goods/g
 goods.public.get_marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/get_marketing_list"
 goods.public.get_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/get_distributor"
 goods.public.pindan_goods = "http://goods.test.int.yidian-inc.com/goods/goods/pindan_goods"
+goods.public.user_wechat_bind = "http://goods.test.int.yidian-inc.com/user/user/user_wechat_bind"
+
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.test.int.yidian-inc.com/user/user/wechat_login"
 goods.user.bind_phone = "http://goods.test.int.yidian-inc.com/user/user/bind_phone"
-
+goods.user.bind_avatar = "http://goods.test.int.yidian-inc.com/user/user/bind_avatar"
 
 
 ;tcc调goods用子项目
@@ -516,6 +520,12 @@ 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_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.user.is_new_user = "http://order.test.yidian-inc.com/order/order/is_new_user"
+order.order.wx_share_code = "http://order.test.yidian-inc.com/order/order/wx_share_code"
+order.marketing.marketing_order_list = "http://order.test.yidian-inc.com/order/marketing/marketing_order_list"
+order.order.order_confirm_page = "http://order.test.yidian-inc.com/order/order/order_confirm_page"
+
+
 
 ;订单后台
 order.order.old_order_list = "http://order.test.yidian-inc.com/order/order/old_order_list"
@@ -576,8 +586,13 @@ 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.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" ;订单取消
@@ -668,6 +683,7 @@ interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.co
 interaction.index.syn_account = "http://interaction.dev.yidian-inc.com/follow/index/syn_account"
 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_subscribe = "http://interact.dev.yidian-inc.com/msg/index/is_send"
 
 
@@ -736,12 +752,13 @@ goods.public.goods_spu_shop_list = "http://goods.dev.yidian-inc.com/goods/goods/
 goods.public.get_marketing_list = "http://goods.dev.yidian-inc.com/marketing/marketing/get_marketing_list"
 goods.public.get_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/get_distributor"
 goods.public.pindan_goods = "http://goods.dev.yidian-inc.com/goods/goods/pindan_goods"
+goods.public.user_wechat_bind = "http://goods.dev.yidian-inc.com/user/user/user_wechat_bind"
 
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.dev.yidian-inc.com/user/user/wechat_login"
 goods.user.bind_phone = "http://goods.dev.yidian-inc.com/user/user/bind_phone"
-
+goods.user.bind_avatar = "http://goods.dev.yidian-inc.com/user/user/bind_avatar"
 
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_try"
@@ -769,6 +786,11 @@ 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_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.user.is_new_user = "http://order.dev.yidian-inc.com/order/order/is_new_user"
+order.order.wx_share_code = "http://order.dev.yidian-inc.com/order/order/wx_share_code"
+order.marketing.marketing_order_list = "http://order.dev.yidian-inc.com/order/marketing/marketing_order_list"
+order.order.order_confirm_page = "http://order.dev.yidian-inc.com/order/order/order_confirm_page"
+
 
 ;订单后台
 order.order.old_order_list = "http://order.dev.yidian-inc.com/order/order/old_order_list"
@@ -828,8 +850,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.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" ;订单取消

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,15 +2,21 @@
 [common]
 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]