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

email.ini

@@ -5,7 +5,6 @@
 to_email                = api@yidian-inc.com
 
 [dev-tcc : common]
-to_email                = zhangyu1@yidian-inc.com
 
 [test-tcc : common]
-to_email                = zhangyu1@yidian-inc.com
+to_email                = wanjilong@yidian-inc.com
\ No newline at end of file

interface.ini

@@ -118,7 +118,7 @@ interaction.index.is_follow = "http://interact.int.yidian-inc.com/follow/index/i
 interaction.inner.digg = "http://interact.int.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interact.int.yidian-inc.com/follow/index/get_count_and_isfollow"
 interaction.index.syn_account = "http://interact.int.yidian-inc.com/follow/index/syn_account"
-interaction.index.wechat = "http://interact.int.yidian-inc.com/msg/index/wechat"
+interaction.index.wechat = "http://interact.int.yidian-inc.com/msg/index/wechat_msg"
 
 
 ;======================= 4000000-prod goods微服务接口 ======================= 
@@ -210,6 +210,7 @@ order.order.old_order_item_list = "http://order.int.yidian-inc.com/order/order/o
 order.order.old_order_refund = "http://order.int.yidian-inc.com/order/order/old_order_refund"
 order.order.old_order_refund_reject = "http://order.int.yidian-inc.com/order/order/old_order_refund_reject"
 order.order.old_order_export = "http://order.int.yidian-inc.com/order/order/old_order_export"
+order.order.old_order_print = "http://order.int.yidian-inc.com/order/order/old_print_order_list"
 
 
 ;tcc调order用子项目
@@ -227,6 +228,7 @@ order.deliverer.add_deliverer = "http://order.int.yidian-inc.com/deliverer/deliv
 order.deliverer.list_day_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
 order.deliverer.save_day_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
 order.deliverer.list_day_deliverer_conf = "http://order.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
+order.deliverer.plan_down = "http://order.int.yidian-inc.com/deliverer/deliverer/plan_down"
 ;======================= 6000000-prod pay微服务接口 ======================= 
 pay.order.pay = "http://pay.int.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.int.yidian-inc.com/pay/order/refund"
@@ -246,7 +248,8 @@ wallet.account.third_account = "http://wallet.int.yidian-inc.com/wallet/account/
 wallet.account.withdraw_validate = "http://wallet.int.yidian-inc.com/wallet/account/withdraw_validate"
 wallet.account.withdraw_detail = "http://wallet.int.yidian-inc.com/wallet/account/withdraw_detail"
 wallet.historyapi.total_trade = "http://wallet.int.yidian-inc.com/wallet/historyapi/total_trade"
-wallet.historyapi.history_list = "http://wallet.dev.yidian-inc.com/wallet/historyapi/history_list"
+wallet.historyapi.history_list = "http://wallet.int.yidian-inc.com/wallet/historyapi/history_list"
+wallet.historyapi.withdraw_wechat = "http://wallet.int.yidian-inc.com/wallet/historyapi/withdraw_wechat"
 wallet.callback.withdraw = "http://wallet.int.yidian-inc.com/wallet/callback/withdraw"
 wallet.withdrawbackground.apply_list = "http://wallet.int.yidian-inc.com/wallet/background/apply_list"
 wallet.withdrawbackground.blacklist = "http://wallet.int.yidian-inc.com/wallet/background/blacklist"
@@ -255,7 +258,15 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.int.yidian-inc.com
 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"
 
-
+;======================== 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" ;优惠券列表
 
 [perf : prod : common]
 
@@ -378,7 +389,7 @@ interaction.index.is_follow = "http://interaction.test.yidian-inc.com/follow/ind
 interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
 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"
+interaction.index.wechat = "http://interaction.test.yidian-inc.com/msg/index/wechat_msg"
 
 
 ;======================= 4000000-test goods微服务接口 ======================= 
@@ -470,6 +481,7 @@ order.order.old_order_item_list = "http://order.test.yidian-inc.com/order/order/
 order.order.old_order_refund = "http://order.test.yidian-inc.com/order/order/old_order_refund"
 order.order.old_order_refund_reject = "http://order.test.yidian-inc.com/order/order/old_order_refund_reject"
 order.order.old_order_export = "http://order.test.yidian-inc.com/order/order/old_order_export"
+order.order.old_order_print = "http://order.test.yidian-inc.com/order/order/old_print_order_list"
 
 
 ;tcc调order用子项目
@@ -483,11 +495,11 @@ order.tcc.create_order_main = "http://order.test.yidian-inc.com/tcc/tcc/create_o
 order.tcc.cancel_order_main = "http://order.test.yidian-inc.com/tcc/tcc/cancel_order_main"
 
 ;deliver 骑手
-order.deliverer.add_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/add_deliverer"
-order.deliverer.list_day_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
-order.deliverer.save_day_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
-order.deliverer.list_day_deliverer_conf = "http://order.test.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
-
+order.deliverer.add_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/add_deliverer"
+order.deliverer.list_day_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
+order.deliverer.save_day_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
+order.deliverer.list_day_deliverer_conf = "http://order.test.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
+order.deliverer.plan_down = "http://order.test.yidian-inc.com/deliverer/deliverer/plan_down"
 ;======================= 6000000-test pay微服务接口 ======================= 
 pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.test.yidian-inc.com/pay/order/refund"
@@ -507,7 +519,8 @@ wallet.account.third_account = "http://wallet.test.yidian-inc.com/wallet/account
 wallet.account.withdraw_validate = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_validate"
 wallet.account.withdraw_detail = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_detail"
 wallet.historyapi.total_trade = "http://wallet.test.yidian-inc.com/wallet/historyapi/total_trade"
-wallet.historyapi.history_list = "http://wallet.dev.yidian-inc.com/wallet/historyapi/history_list"
+wallet.historyapi.history_list = "http://wallet.test.yidian-inc.com/wallet/historyapi/history_list"
+wallet.historyapi.withdraw_wechat = "http://wallet.test.yidian-inc.com/wallet/historyapi/withdraw_wechat"
 wallet.callback.withdraw = "http://wallet.test.yidian-inc.com/wallet/callback/withdraw"
 wallet.withdrawbackground.apply_list = "http://wallet.test.yidian-inc.com/wallet/background/apply_list"
 wallet.withdrawbackground.blacklist = "http://wallet.test.yidian-inc.com/wallet/background/blacklist"
@@ -516,7 +529,15 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.test.yidian-inc.co
 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"
 
-
+;======================== 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]
 
 
@@ -602,7 +623,7 @@ interaction.index.is_follow = "http://interaction.dev.yidian-inc.com/follow/inde
 interaction.inner.digg = "http://interaction.dev.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.com/follow/index/get_count_and_isfollow"
 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"
+interaction.index.wechat = "http://interaction.dev.yidian-inc.com/msg/index/wechat_msg"
 
 
 ;======================= 4000000-dev goods微服务接口 ======================= 
@@ -693,7 +714,7 @@ order.order.old_order_item_list = "http://order.dev.yidian-inc.com/order/order/o
 order.order.old_order_refund = "http://order.dev.yidian-inc.com/order/order/old_order_refund"
 order.order.old_order_refund_reject = "http://order.dev.yidian-inc.com/order/order/old_order_refund_reject"
 order.order.old_order_export = "http://order.dev.yidian-inc.com/order/order/old_order_export"
-
+order.order.old_order_print = "http://order.dev.yidian-inc.com/order/order/old_print_order_list"
 
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_try"
@@ -710,6 +731,7 @@ order.deliverer.add_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliv
 order.deliverer.list_day_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
 order.deliverer.save_day_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
 order.deliverer.list_day_deliverer_conf = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
+order.deliverer.plan_down = "http://order.dev.yidian-inc.com/deliverer/deliverer/plan_down"
 ;======================= 6000000-dev pay微服务接口 ======================= 
 pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.dev.yidian-inc.com/pay/order/refund"
@@ -739,7 +761,15 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.dev.yidian-inc.com
 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"
 
-
+;======================== 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" ;优惠券列表
 
 ; =======================  gateway ==================================================================================
 

mysql.ini

@@ -239,7 +239,7 @@ tccIndex.connect_timeout=2
 tccIndex.username='bp_rw'
 tccIndex.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 tccIndex.charset='utf8mb4'
-tccIndex.write.host='w.bp_test_mysql5.int.yidian-inc.com:3310,w.bp_test_mysql5.int.yidian-inc.com:3310'
+tccIndex.write.host='w.bp_test_mysql5.int.yidian-inc.com:3310'
 tccIndex.read.host[]='r.bp_test_mysql5_1.int.yidian-inc.com:3310,r.bp_test_mysql5_1.int.yidian-inc.com:3310'
 tccIndex.read.host[]='r.bp_test_mysql5_2.int.yidian-inc.com:3310,r.bp_test_mysql5_2.int.yidian-inc.com:3310'
 
@@ -267,6 +267,19 @@ commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
 commerce.charset='utf8mb4'
 commerce.write.host='dbproxy.local.cutt.com:5101'
 commerce.read.host='dbproxy.local.cutt.com:5101'
+
+
+; 生活号 接龙拼单 用户信息
+zhiyue.database_type='mysql'
+zhiyue.database_name='zhiyue'
+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'
+
+
 ; 预发环境
 [perf-order : prod-order : order : common]
 
@@ -288,8 +301,19 @@ 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'
+
+
+; 生活号 接龙拼单 用户信息
+zhiyue.database_type='mysql'
+zhiyue.database_name='zhiyue'
+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'
 
 ; 开发联调测试
 [dev-order : order : common]
@@ -307,11 +331,25 @@ order.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.i
 commerce.database_type='mysql'
 commerce.database_name='commerce'
 commerce.connect_timeout=2
-commerce.username='commerce_rw'
-commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
+commerce.username='shq_rw'
+commerce.password='@Z0#ylCRgPKx4v1bjqH5#mNP%9UO7t'
 commerce.charset='utf8mb4'
-commerce.write.host='dbproxy.local.cutt.com:5101'
-commerce.read.host='dbproxy.local.cutt.com:5101'
+commerce.write.host='10.126.154.178:3306'
+commerce.read.host='10.126.154.178:3306'
+
+
+
+; 生活号 接龙拼单 用户信息
+zhiyue.database_type='mysql'
+zhiyue.database_name='zhiyue'
+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'
+
+
 
 
 [pay : common]
@@ -430,3 +468,41 @@ 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 : common]
+
+; 生产环境
+[prod-coupon : coupon : common]
+wallet.database_type='mysql'
+wallet.database_name='coupon'
+wallet.connect_timeout=2
+wallet.username=''
+wallet.password=''
+wallet.charset='utf8mb4'
+wallet.write.host=''
+wallet.read.host=''
+
+; 预发环境
+[perf-coupon : prod-coupon : wallet : common]
+
+; 测试环境
+[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'
+
+; 联调环境
+[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'

redis.ini

@@ -141,3 +141,30 @@ cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-order : test-order : order : common]
 
+
+[coupon : common]
+
+[prod-coupon : coupon : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18136/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='igbinary'
+cacheConnect.prefix=''
+
+
+[perf-order : coupon : common]
+[test-order : coupon : common]
+;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='igbinary'
+cacheConnect.prefix=''
+[dev-coupon : test-coupon : coupon : common]
+

wallet.ini

@@ -8,22 +8,28 @@ withdraw.day_total_amount = 100000;
 ;Ping++轮训条数
 withdraw.pinpp_sync_limit = 100;
 ;提现审核阈值，超过进审核列表 单位 分
-withdraw.withdraw_apply_amount = 3000;
+withdraw.withdraw_apply_amount = 500;
 ;关闭提现
 withdraw.is_closed = 1;
 [prod-wallet : common]
 ;生产的pingpp key
-withdraw.pingpp_appid = 'app_i58a94Pq1qfDDK4q';
+;新版C端提现appid
+withdraw.new_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
+;旧版C端提现appid
+withdraw.old_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
 
 [test-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
 withdraw.defer_day = 7;
 ;每日提现次数
-withdraw.day_count_limit = 2;
+withdraw.day_count_limit = 20;
 ;每日提现最大限额 单位：分
 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;
 

xhprof.ini

@@ -4,3 +4,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