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

interface.ini

@@ -296,8 +296,11 @@ order.order.pay_order_info = "http://order.test.yidian-inc.com/order/order/pay_o
 order.order.scanpurchase_userverify = "http://order.test.yidian-inc.com/order/order/scanpurchase_userverify"
 
 ;支付
+pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.test.yidian-inc.com/pay/order/refund"
 pay.order.write_off = "http://pay.test.yidian-inc.com/pay/order/write_off"
+pay.callback.pay = "http://pay.test.yidian-inc.com/pay/callback/pay"
+pay.callback.refund = "http://pay.test.yidian-inc.com/pay/callback/refund"
 
 ;钱包
 wallet.account.transfer = "http://wallet.test.yidian-inc.com/wallet/account/transfer"
@@ -474,8 +477,11 @@ order.order.scanpurchase_userverify = "http://order.dev.yidian-inc.com/order/ord
 
 
 ;支付
+pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.dev.yidian-inc.com/pay/order/refund"
 pay.order.write_off = "http://pay.dev.yidian-inc.com/pay/order/write_off"
+pay.callback.pay = "http://pay.dev.yidian-inc.com/pay/callback/pay"
+pay.callback.refund = "http://pay.dev.yidian-inc.com/pay/callback/refund"
 
 ;钱包
 wallet.account.transfer = "http://wallet.dev.yidian-inc.com/wallet/account/transfer"

mysql.ini

@@ -42,8 +42,6 @@ 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'
 
 
-
-
 [interaction : common]
 ; 生产环境
 [prod-interaction : interaction : common]