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

interface.ini

@@ -227,6 +227,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 +247,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"
@@ -483,11 +485,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 +509,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 +519,6 @@ 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"
 
-
 [dev : test : common]
 
 
@@ -710,6 +712,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"

mysql.ini

@@ -265,11 +265,11 @@ 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='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'
 
 ; 开发联调测试
 [dev-order : order : common]
@@ -287,11 +287,11 @@ 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'
 
 
 [pay : common]

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