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"
@@ -255,6 +262,7 @@ goods.marketing.send_sms_code = "http://goods.test.yidian-inc.com/marketing/dist
 goods.marketing.distributor = "http://goods.test.yidian-inc.com/marketing/distributor/distributor"
 goods.marketing.distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_list"
 goods.marketing.distributor_code_url = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_code_url"
+goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
  
 ;商品
 goods.public.get_goods_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_category_list"
@@ -280,10 +288,12 @@ goods.public.goods_spu_list = "http://goods.test.int.yidian-inc.com/goods/goods/
 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.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
@@ -295,7 +305,7 @@ pay.callback.refund = "http://pay.test.yidian-inc.com/pay/callback/refund"
 ;钱包
 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.third_account = "http://wallet.test.yidian-inc.com/wallet/account/third_account"
+wallet.account.account_info = "http://wallet.test.yidian-inc.com/wallet/account/account_info"
 
 
 ;tcc调goods用子项目
@@ -358,6 +368,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"
@@ -418,6 +430,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"
 
 
 ;团长
@@ -428,6 +441,7 @@ goods.marketing.send_sms_code = "http://goods.dev.yidian-inc.com/marketing/distr
 goods.marketing.distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor"
 goods.marketing.distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_list"
 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"
 
 
 ;商品
@@ -454,9 +468,13 @@ goods.public.goods_spu_list = "http://goods.dev.yidian-inc.com/goods/goods/goods
 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"
+
 
 ;支付
 pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
@@ -468,7 +486,7 @@ pay.callback.refund = "http://pay.dev.yidian-inc.com/pay/callback/refund"
 ;钱包
 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.third_account = "http://wallet.dev.yidian-inc.com/wallet/account/third_account"
+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";

mongo.ini

@@ -7,7 +7,7 @@
 
 ;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
 [prod-gateway : gateway : common]
-gateway.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+gateway.host="rs_bp_merchant_01.int.yidian-inc.com:27017,rs_bp_merchant_02.int.yidian-inc.com:27017,rs_bp_merchant_03.int.yidian-inc.com:27017"
 gateway.uriOptions.username='rs_merchant_rw'
 gateway.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
 gateway.uriOptions.replicaSet='rs_bp'
@@ -20,7 +20,7 @@ gateway.driverOptions.typeMap.root='array'
 gateway.driverOptions.typeMap.document='array'
  
 
-xhprof.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+xhprof.host="rs_bp_merchant_01.int.yidian-inc.com:27017,rs_bp_merchant_02.int.yidian-inc.com:27017,rs_bp_merchant_03.int.yidian-inc.com:27017"
 xhprof.uriOptions.username='rs_merchant_rw'
 xhprof.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
 xhprof.uriOptions.replicaSet='rs_bp'

mysql.ini

@@ -218,3 +218,35 @@ 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'