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

interface.ini

@@ -287,6 +287,16 @@ order.order.pay_order_item = "http://order.test.yidian-inc.com/order/order/pay_o
 order.order.pay_order_info = "http://order.test.yidian-inc.com/order/order/pay_order_info"
 
 
+;支付
+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"
+
+;钱包
+wallet.account.transfer = "http://wallet.test.yidian-inc.com/wallet/account/transfer"
+wallet.account.list = "http://wallet.test.yidian-inc.com/wallet/account/list"
+wallet.account.account_info = "http://wallet.test.yidian-inc.com/wallet/account/account_info"
+
+
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_try";
 goods.tcc.place_an_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_confirm";
@@ -449,6 +459,14 @@ order.order.pay_order = "http://order.dev.yidian-inc.com/order/order/pay_order"
 order.order.pay_order_item = "http://order.dev.yidian-inc.com/order/order/pay_order_item"
 order.order.pay_order_info = "http://order.dev.yidian-inc.com/order/order/pay_order_info"
 
+;支付
+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"
+
+;钱包
+wallet.account.transfer = "http://wallet.dev.yidian-inc.com/wallet/account/transfer"
+wallet.account.list = "http://wallet.dev.yidian-inc.com/wallet/account/list"
+wallet.account.account_info = "http://wallet.dev.yidian-inc.com/wallet/account/account_info"
 
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_try";
@@ -507,6 +525,14 @@ order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_or
 [test-pay : test]
 [dev-pay : dev]
 
+
+; =======================  wallet ==================================================================================
+
+[prod-wallet : prod]
+[perf-wallet : perf]
+[test-wallet : test]
+[dev-wallet : dev]
+
 ; =======================  interaction ==================================================================================
 
 [prod-interaction : prod]

mysql.ini

@@ -176,3 +176,77 @@ order.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 order.charset='utf8mb4'
 order.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 order.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+tccIndex.database_type='mysql'
+tccIndex.database_name='bp_tcc'
+tccIndex.connect_timeout=2
+tccIndex.username='bp_test_rw'
+tccIndex.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+tccIndex.charset='utf8'
+tccIndex.write.host='w.bp_test_mysql5.int.yidian-inc.com:3310'
+tccIndex.read.host='r.bp_test_mysql5_1.int.yidian-inc.com:3310,r.bp_test_mysql5_2.int.yidian-inc.com:3310'
+
+
+
+[pay : common]
+
+; 生产环境
+[prod-pay : pay : common]
+
+
+; 预发环境
+[perf-pay : prod-pay : pay : common]
+
+; 测试环境
+[test-pay : pay : common]
+pay.database_type='mysql'
+pay.database_name='pay'
+pay.connect_timeout=2
+pay.username='bp_test_rw'
+pay.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+pay.charset='utf8mb4'
+pay.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+pay.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 联调环境
+[dev-pay : pay : common]
+pay.database_type='mysql'
+pay.database_name='pay'
+pay.connect_timeout=2
+pay.username='bp_test_rw'
+pay.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+pay.charset='utf8mb4'
+pay.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+pay.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+
+[wallet : common]
+
+; 生产环境
+[prod-wallet : wallet : common]
+
+
+; 预发环境
+[perf-wallet : prod-wallet : wallet : common]
+
+; 测试环境
+[test-wallet : wallet : common]
+wallet.database_type='mysql'
+wallet.database_name='wallet'
+wallet.connect_timeout=2
+wallet.username='bp_test_rw'
+wallet.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+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-wallet : wallet : common]
+wallet.database_type='mysql'
+wallet.database_name='wallet'
+wallet.connect_timeout=2
+wallet.username='bp_test_rw'
+wallet.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+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'