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

interface.ini

@@ -70,6 +70,8 @@ merchant.enterprise.delete_life_user   = "http://merchant.int.yidian-inc.com/aut
 merchant.recruitinner.create_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/create_recruit"
 merchant.recruitinner.update_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruitinner.get_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_recruit"
+merchant.recruitinner.get_enterprise_info  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.get_life_enter_info  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 
 merchant.enterprise.send_code   = "http://merchant.int.yidian-inc.com/auth/verify/send_code"
 merchant.enterprise.check_code   = "http://merchant.int.yidian-inc.com/auth/verify/check_code"
@@ -186,6 +188,8 @@ merchant.recruit.get_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount
 merchant.recruitinner.create_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/create_recruit"
 merchant.recruitinner.update_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruitinner.get_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
+merchant.recruitinner.get_enterprise_info  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.get_life_enter_info  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 
 merchant.enterprise.send_code   = "http://merchant.test.yidian-inc.com/auth/verify/send_code"
 merchant.enterprise.check_code   = "http://merchant.test.yidian-inc.com/auth/verify/check_code"
@@ -246,6 +250,9 @@ goods.marketing.marketing_goods_list = "http://goods.test.int.yidian-inc.com/mar
 goods.marketing.generate_share_goods = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
 goods.marketing.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_list"
 goods.marketing.marketing_goods_rate = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_rate"
+goods.marketing.get_marketing_goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
+
+
 
 ;团长
 goods.marketing.second_distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/second_distributor_list"
@@ -273,14 +280,30 @@ goods.consumer.goods_list_es = "http://goods.test.int.yidian-inc.com/goods/goods
 goods.consumer.goods_info = "http://goods.test.int.yidian-inc.com/goods/goods/info_fe"
 goods.consumer.goods_add = "http://goods.test.int.yidian-inc.com/goods/goods/add"
 
+goods.public.goods_sku_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_sku_list"
+goods.public.goods_spu_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_spu_list"
+
+
 ;订单
 order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
 order.order.merchant_order_list = "http://order.test.yidian-inc.com/order/order/merchant_order_list"
 order.order.create_order = "http://order.test.yidian-inc.com/order/order/create_order"
+order.order.cancel_order = "http://order.test.yidian-inc.com/order/order/cancel_order"
+order.order.refund_apply = "http://order.test.yidian-inc.com/order/order/refund_apply"
+order.order.pay_order = "http://order.test.yidian-inc.com/order/order/pay_order"
+order.order.pay_order_item = "http://order.test.yidian-inc.com/order/order/pay_order_item"
+order.order.pay_order_info = "http://order.test.yidian-inc.com/order/order/pay_order_info"
+order.order.scanpurchase_userverify = "http://order.test.yidian-inc.com/order/order/scanpurchase_userverify"
 
+;支付
+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"
 
-goods.public.goods_sku_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_sku_list"
-goods.public.goods_spu_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_spu_list"
 
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_try";
@@ -342,6 +365,8 @@ merchant.recruitinner.create_recruit  = "http://merchant.dev.yidian-inc.com/life
 merchant.recruitinner.update_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruitinner.get_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
 merchant.recruitinner.batch_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/check_recruit"
+merchant.recruitinner.get_enterprise_info  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.get_life_enter_info  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 
 ;管理员用户权限相关接口
 merchant.authority.get_role_list  = "http://merchant.dev.yidian-inc.com/authority/authority/get_role_list"
@@ -402,6 +427,7 @@ goods.marketing.marketing_goods_list = "http://goods.dev.yidian-inc.com/marketin
 goods.marketing.generate_share_goods = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
 goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_list"
 goods.marketing.marketing_goods_rate = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_rate"
+goods.marketing.get_marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
 
 
 ;团长
@@ -431,15 +457,30 @@ goods.consumer.goods_list_es = "http://goods.dev.yidian-inc.com/goods/goods/good
 goods.consumer.goods_info = "http://goods.dev.yidian-inc.com/goods/goods/info_fe"
 goods.consumer.goods_add = "http://goods.dev.yidian-inc.com/goods/goods/add"
 
+goods.public.goods_sku_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_sku_list"
+goods.public.goods_spu_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_spu_list"
+
 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
 order.order.merchant_order_list = "http://order.dev.yidian-inc.com/order/order/merchant_order_list"
 order.order.create_order = "http://order.dev.yidian-inc.com/order/order/create_order"
+order.order.cancel_order = "http://order.dev.yidian-inc.com/order/order/cancel_order"
+order.order.refund_apply = "http://order.dev.yidian-inc.com/order/order/refund_apply"
+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"
+order.order.scanpurchase_userverify = "http://order.dev.yidian-inc.com/order/order/scanpurchase_userverify"
 
 
-goods.public.goods_sku_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_sku_list"
-goods.public.goods_spu_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_spu_list"
+;支付
+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";
@@ -462,6 +503,7 @@ order.tcc.create_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/create_or
 order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_order_main";
 
 
+
 ; =======================  gateway ==================================================================================
 
 [prod-gateway : prod]
@@ -497,6 +539,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'