Merge branch 'feature_coupon' into 'master'

update:修改数据库配置

See merge request bp/yaconf!12

interface.ini

@@ -260,12 +260,6 @@ 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.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" ;优惠券列表
 
@@ -532,12 +526,6 @@ 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.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]
@@ -765,12 +753,6 @@ 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.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

@@ -488,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'