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

interface.ini

@@ -258,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]
 
@@ -521,6 +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]
 
 
@@ -744,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

@@ -73,6 +73,17 @@ 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.connect_timeout=2
+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'
+
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
 
@@ -96,6 +107,16 @@ 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='interaction2'
+fu.connect_timeout=2
+fu.username='bp_rw'
+fu.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+fu.charset='utf8mb4'
+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]
 interaction.database_type='mysql'
@@ -116,15 +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='interaction2'
+fu.connect_timeout=2
+fu.username='bp_rw'
+fu.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+fu.charset='utf8mb4'
+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]
@@ -247,6 +268,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]
 
@@ -265,11 +299,22 @@ order.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.i
 commerce.database_type='mysql'
 commerce.database_name='commerce'
 commerce.connect_timeout=2
-commerce.username='shq_rw'
-commerce.password='@Z0#ylCRgPKx4v1bjqH5#mNP%9UO7t'
+commerce.username='commerce_rw'
+commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
 commerce.charset='utf8mb4'
-commerce.write.host='10.126.154.178:3306'
-commerce.read.host='10.126.154.178:3306'
+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]
@@ -294,6 +339,20 @@ 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]
 
 ; 生产环境
@@ -410,3 +469,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]
+

xhprof.ini

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