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

interface.ini

@@ -164,6 +164,8 @@ goods.marketing.distributor_list = "http://goods.int.yidian-inc.com/marketing/di
 goods.marketing.distributor_code_url = "http://goods.int.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.int.yidian-inc.com/marketing/distributor/is_distributor"
 
+goods.marketing.update_marketing_online_status = "http://goods.int.yidian-inc.com/marketing/marketing/update_marketing_online_status"
+
 ;自提点
 goods.marketing.add_take_place = "http://goods.int.yidian-inc.com/marketing/takeplace/add"
 goods.marketing.take_place_list = "http://goods.int.yidian-inc.com/marketing/takeplace/list"
@@ -322,6 +324,8 @@ 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"
 wallet.historyapi.sendmsg = "https://ex.jwshq.cn/app/msg/sendMessage"
+wallet.withdrawbackground.account_list = "http://wallet.int.yidian-inc.com/wallet/background/account_list"
+wallet.accountbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/background/account_record_list"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -502,6 +506,8 @@ goods.marketing.distributor_list = "http://goods.test.int.yidian-inc.com/marketi
 goods.marketing.distributor_code_url = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
 
+goods.marketing.update_marketing_online_status = "http://goods.test.int.yidian-inc.com/marketing/marketing/update_marketing_online_status"
+
 ;自提点
 goods.marketing.add_take_place = "http://goods.test.int.yidian-inc.com/marketing/takeplace/add"
 goods.marketing.take_place_list = "http://goods.test.int.yidian-inc.com/marketing/takeplace/list"
@@ -658,6 +664,8 @@ 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"
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
+wallet.withdrawbackground.account_list = "http://wallet.test.yidian-inc.com/wallet/background/account_list"
+wallet.accountbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/account_record_list"
 
 ;======================== 9000000-prod coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -801,6 +809,8 @@ goods.marketing.distributor_list = "http://goods.dev.yidian-inc.com/marketing/di
 goods.marketing.distributor_code_url = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/is_distributor"
 
+goods.marketing.update_marketing_online_status = "http://goods.dev.yidian-inc.com/marketing/marketing/update_marketing_online_status"
+
 ;自提点
 goods.marketing.add_take_place = "http://goods.dev.yidian-inc.com/marketing/takeplace/add"
 goods.marketing.take_place_list = "http://goods.dev.yidian-inc.com/marketing/takeplace/list"
@@ -956,6 +966,8 @@ 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"
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
+wallet.withdrawbackground.account_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_list"
+wallet.accountbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_record_list"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 

mysql.ini

@@ -472,14 +472,14 @@ wallet.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.
 
 ; 生产环境
 [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=''
+coupon.database_type='mysql'
+coupon.database_name='coupon'
+coupon.connect_timeout=2
+coupon.username='bp_coupon_rw'
+coupon.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+coupon.charset='utf8mb4'
+coupon.write.host='w.bp_coupon.int.yidian-inc.com:3306'
+coupon.read.host='r.bp_coupon_1.int.yidian-inc.com:3306,r.bp_coupon_2.int.yidian-inc.com:3306'
 
 ; 预发环境
 [perf-coupon : prod-coupon : wallet : common]