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

interface.ini

@@ -31,7 +31,7 @@ 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"
-	
+
 
 ;idgen发号器
 service.idgen = "http://idgen.int.yidian-inc.com/id/get"
@@ -155,6 +155,8 @@ goods.marketing.is_distributor = "http://goods.int.yidian-inc.com/marketing/dist
 ;分享
 goods.wx.appgc = "https://wx.appgc.cn"
 goods.api.jwshq = "http://api.jwshq.cn"
+
+
 ;商品
 goods.public.get_goods_category_list = "http://goods.int.yidian-inc.com/goods/goods/get_goods_category_list"
 goods.public.get_level_one_category_list = "http://goods.int.yidian-inc.com/goods/goods/get_level_one_category_list"
@@ -174,6 +176,13 @@ goods.public.goods_sku_list = "http://goods.int.yidian-inc.com/goods/goods/goods
 goods.public.goods_spu_list = "http://goods.int.yidian-inc.com/goods/goods/goods_spu_list"
 goods.public.get_goods_sku = "http://goods.int.yidian-inc.com/goods/goods/get_goods_sku"
 goods.public.goods_spu_shop_list = "http://goods.int.yidian-inc.com/goods/goods/goods_spu_shop_list"
+
+
+;用户绑定
+goods.user.wechat_login = "http://goods.int.yidian-inc.com/user/user/wechat_login"
+goods.user.bind_phone = "http://goods.int.yidian-inc.com/user/user/bind_phone"
+
+
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.int.yidian-inc.com/tcc/tcc/place_an_order_try"
 goods.tcc.place_an_order_confirm = "http://goods.int.yidian-inc.com/tcc/tcc/place_an_order_confirm"
@@ -257,14 +266,9 @@ wallet.withdrawbackground.withdraw_audit = "http://wallet.int.yidian-inc.com/wal
 wallet.withdrawbackground.back_freezing_fund = "http://wallet.int.yidian-inc.com/wallet/background/back_freezing_fund"
 wallet.withdrawbackground.apply_detail = "http://wallet.int.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/background/record_list"
+wallet.historyapi.sendmsg = "https://ex.jwshq.cn/app/msg/sendMessage"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
-coupon.admin.amount_pool.list = "http://coupon.int.yidian-inc.com/coupon/amount_pool/list" ;资金池列表
-coupon.admin.amount_pool.save = "http://coupon.int.yidian-inc.com/coupon/amount_pool/save" ;保存资金池
-coupon.admin.amount_pool.detail = "http://coupon.int.yidian-inc.com/coupon/amount_pool/detail" ;资金池详情
-coupon.admin.coupon_type.list = "http://coupon.int.yidian-inc.com/coupon/admin/" ;优惠券类型列表
-coupon.admin.coupon_type.save = "http://coupon.int.yidian-inc.com/coupon/admin/" ;优惠券类型保存
-coupon.admin.coupon_type.detail = "http://coupon.int.yidian-inc.com/coupon/admin/" ;资金池优惠券详情
 coupon.wxapp.apply = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
 coupon.wxapp.list = "http://coupon.int.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
 
@@ -444,6 +448,11 @@ goods.public.get_marketing_list = "http://goods.test.int.yidian-inc.com/marketin
 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.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"
+
+
 
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_try"
@@ -528,14 +537,9 @@ wallet.withdrawbackground.withdraw_audit = "http://wallet.test.yidian-inc.com/wa
 wallet.withdrawbackground.back_freezing_fund = "http://wallet.test.yidian-inc.com/wallet/background/back_freezing_fund"
 wallet.withdrawbackground.apply_detail = "http://wallet.test.yidian-inc.com/wallet/background/apply_detail"
 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"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
-coupon.admin.amount_pool.list = "http://coupon.test.yidian-inc.com/coupon/amount_pool/list" ;资金池列表
-coupon.admin.amount_pool.save = "http://coupon.test.yidian-inc.com/coupon/amount_pool/save" ;保存资金池
-coupon.admin.amount_pool.detail = "http://coupon.test.yidian-inc.com/coupon/amount_pool/detail" ;资金池详情
-coupon.admin.coupon_type.list = "http://coupon.test.yidian-inc.com/coupon/admin/" ;优惠券类型列表
-coupon.admin.coupon_type.save = "http://coupon.test.yidian-inc.com/coupon/admin/" ;优惠券类型保存
-coupon.admin.coupon_type.detail = "http://coupon.test.yidian-inc.com/coupon/admin/" ;资金池优惠券详情
 coupon.wxapp.apply = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
 coupon.wxapp.list = "http://coupon.test.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
 [dev : test : common]
@@ -679,6 +683,12 @@ goods.public.get_marketing_list = "http://goods.dev.yidian-inc.com/marketing/mar
 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.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"
+
+
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_try"
 goods.tcc.place_an_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_confirm"
@@ -689,6 +699,7 @@ goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_
 
 
 
+
 ;======================= 5000000-dev order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
@@ -761,14 +772,9 @@ wallet.withdrawbackground.withdraw_audit = "http://wallet.dev.yidian-inc.com/wal
 wallet.withdrawbackground.back_freezing_fund = "http://wallet.dev.yidian-inc.com/wallet/background/back_freezing_fund"
 wallet.withdrawbackground.apply_detail = "http://wallet.dev.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/background/record_list"
+wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
-coupon.admin.amount_pool.list = "http://coupon.dev.yidian-inc.com/coupon/amount_pool/list" ;资金池列表
-coupon.admin.amount_pool.save = "http://coupon.dev.yidian-inc.com/coupon/amount_pool/save" ;保存资金池
-coupon.admin.amount_pool.detail = "http://coupon.dev.yidian-inc.com/coupon/amount_pool/detail" ;资金池详情
-coupon.admin.coupon_type.list = "http://coupon.dev.yidian-inc.com/coupon/admin/" ;优惠券类型列表
-coupon.admin.coupon_type.save = "http://coupon.dev.yidian-inc.com/coupon/admin/" ;优惠券类型保存
-coupon.admin.coupon_type.detail = "http://coupon.dev.yidian-inc.com/coupon/admin/" ;资金池优惠券详情
 coupon.wxapp.apply = "http://coupon.dev.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
 coupon.wxapp.list = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
 

mysql.ini

@@ -107,16 +107,15 @@ merchant.charset='utf8mb4'
 merchant.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
 merchant.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
-;导数据专用--线上
 fu.database_type='mysql'
-fu.database_name='interaction'
+fu.database_name='interaction2'
 fu.connect_timeout=2
-fu.username='zhiyue_tmp_ro'
-fu.password='AABBCCDD'
+fu.username='bp_rw'
+fu.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 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'
+fu.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+fu.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
 
 ; 联调环境
 [dev-interaction : interaction : common]
@@ -138,26 +137,15 @@ merchant.charset='utf8mb4'
 merchant.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
-;导数据专用--目前调试
-dao.database_type='mysql'
-dao.database_name='zhiyue'
-dao.connect_timeout=2
-dao.username='zhiyue_tmp_ro'
-dao.password='AABBCCDD'
-dao.charset='utf8mb4'
-;marketing.write.host='10.126.155.120:3306'
-dao.read.host='10.136.150.2:3307'
 
-;导数据专用--线上
 fu.database_type='mysql'
-fu.database_name='interaction'
+fu.database_name='interaction2'
 fu.connect_timeout=2
-fu.username='zhiyue_tmp_ro'
-fu.password='AABBCCDD'
+fu.username='bp_rw'
+fu.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 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'
+fu.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+fu.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
 
 [goods : common]
@@ -278,8 +266,8 @@ commerce.connect_timeout=2
 commerce.username='commerce_rw'
 commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
 commerce.charset='utf8mb4'
-commerce.write.host='dbproxy.local.cutt.com:5101'
-commerce.read.host='dbproxy.local.cutt.com:5101'
+commerce.write.host='10.9.155.216:4066'
+commerce.read.host='10.9.155.216:4066'
 
 
 ; 生活号 接龙拼单 用户信息
@@ -289,8 +277,8 @@ zhiyue.connect_timeout=2
 zhiyue.username='zhiyue_ro'
 zhiyue.password='s5JEh#FUvX%7P3sO9ZDQw&cpH$Xr8Q'
 zhiyue.charset='utf8mb4'
-zhiyue.write.host='10.9.110.120:4066'
-zhiyue.read.host='10.9.110.120:4066'
+zhiyue.write.host='zhiyue-slave.db.appgc.yidian-inc.com:4066'
+zhiyue.read.host='zhiyue-slave.db.appgc.yidian-inc.com:4066'
 
 
 ; 预发环境
@@ -500,22 +488,22 @@ wallet.read.host=''
 
 ; 测试环境
 [test-coupon : coupon : common]
-wallet.database_type='mysql'
-wallet.database_name='coupon'
-wallet.connect_timeout=2
-wallet.username='bp_rw'
-wallet.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
-wallet.charset='utf8mb4'
-wallet.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
-wallet.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+coupon.database_type='mysql'
+coupon.database_name='coupon'
+coupon.connect_timeout=2
+coupon.username='bp_rw'
+coupon.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+coupon.charset='utf8mb4'
+coupon.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+coupon.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 联调环境
 [dev-coupon : coupon : common]
-wallet.database_type='mysql'
-wallet.database_name='coupon'
-wallet.connect_timeout=2
-wallet.username='bp_rw'
-wallet.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
-wallet.charset='utf8mb4'
-wallet.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
-wallet.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+coupon.database_type='mysql'
+coupon.database_name='coupon'
+coupon.connect_timeout=2
+coupon.username='bp_rw'
+coupon.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+coupon.charset='utf8mb4'
+coupon.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+coupon.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'

request.ini

+; 公共的配置内容，不区分应用及环境
+[common]
+log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
+[merchant : common]
+
+; 生产环境
+[prod-merchant : merchant : common]
+
+; 预发环境
+[perf-merchant : prod-merchant : merchant : common]
+
+;测试测试
+[test-merchant : prod-merchant : merchant : common]
+
+;开发联调测试
+[dev-merchant : prod-merchant : merchant : common]

wallet.ini

@@ -9,14 +9,19 @@ withdraw.day_total_amount = 100000;
 withdraw.pinpp_sync_limit = 100;
 ;提现审核阈值，超过进审核列表 单位 分
 withdraw.withdraw_apply_amount = 500;
-;关闭提现
-withdraw.is_closed = 1;
+;关闭提现 0 打开 1 关闭
+withdraw.is_closed = 0;
+;白名单用户
+withdraw.whitelist = ',510234788199,510227177373,510233204694,510239348329,';
+;兼容老钱包提现，发消息的验签
+withdraw.old_sign = '9e41321e688048d289678dba73be8a28';
+
 [prod-wallet : common]
 ;生产的pingpp key
 ;新版C端提现appid
 withdraw.new_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
-;旧版C端提现appid
-withdraw.old_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
+;生活圈-线上-c端app-老版-提现
+withdraw.old_pingpp_appid = 'app_HGej90rbPiXTHmf5';
 
 [test-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
@@ -41,6 +46,9 @@ withdraw.day_count_limit = 2;
 ;每日提现最大限额 单位：分
 withdraw.day_total_amount = 100000;
 ;测试的pingpp key
-withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;生活圈-测试-c端-新版本-提现
+withdraw.new_pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;生活圈-测试-c端-老版本-提现
+withdraw.old_pingpp_appid = 'app_GirTKSbHG088SCqj';
 ;关闭提现
 withdraw.is_closed = 0;
\ No newline at end of file

xhprof.ini

@@ -3,5 +3,4 @@
 collection.bp_test_go2yd_com = 1
 
 #是否开启xhprof, 按照域名来开启， 值为开启的百分比
-switch.bp_test_go2yd_com = 100
-switch.bp_go2yd_com = 100
\ No newline at end of file
+switch.bp_test_go2yd_com = 100
\ No newline at end of file