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

elasticsearch.ini

@@ -5,9 +5,13 @@
 
 ; 生产环境
 [prod-goods : goods : common]
+goods.host="http://10.138.7.40:40000,http://10.138.7.41:40000,http://10.138.7.42:40000"
+
 
 ; 预发环境
 [perf-goods : prod-goods : goods : common]
+goods.host="http://10.138.7.40:40000,http://10.138.7.41:40000,http://10.138.7.42:40000"
+
 
 ；测试测试
 [test-goods : prod-goods : goods : common]

interface.ini

@@ -68,9 +68,9 @@ merchant.enterprise.check_mobile_code   = "http://merchant.int.yidian-inc.com/au
 merchant.enterprise.change_role   = "http://merchant.int.yidian-inc.com/auth/enterprise/change_role"
 merchant.enterprise.delete_life_user   = "http://merchant.int.yidian-inc.com/auth/enterprise/delete_life_user"
 
-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.add_enterprise  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/add_enterprise"
+merchant.recruitinner.update_enterprise  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/update_enterprise"
+merchant.recruitinner.get_enterprise  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 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"
 
@@ -121,6 +121,12 @@ merchant.account.get_role_list  = "http://merchant.int.yidian-inc.com/lifeaccoun
 merchant.account.get_life_list  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_list"
 merchant.account.get_user_list  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_user_list"
 
+;支付
+pay.order.pay = "http://pay.int.yidian-inc.com/pay/order/pay"
+pay.order.refund = "http://pay.int.yidian-inc.com/pay/order/refund"
+pay.order.write_off = "http://pay.int.yidian-inc.com/pay/order/write_off"
+pay.callback.pay = "http://pay.int.yidian-inc.com/pay/callback/pay"
+pay.callback.refund = "http://pay.int.yidian-inc.com/pay/callback/refund"
 
 [perf : prod : common]
 
@@ -193,9 +199,9 @@ merchant.recruit.create_recruit  = "http://merchant.test.yidian-inc.com/lifeacco
 merchant.recruit.update_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruit.get_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
 
-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.add_enterprise  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/add_enterprise"
+merchant.recruitinner.update_enterprise  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/update_enterprise"
+merchant.recruitinner.get_enterprise  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 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"
 
@@ -311,6 +317,7 @@ 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"
+order.order.scanpurchase_userverify_url = "http://order.test.yidian-inc.com/order/order/scanpurchase_userverify_url"
 order.order.order_pay_callback = "http://order.test.yidian-inc.com/order/order/order_pay_callback"
 order.order.order_refund_callback = "http://order.test.yidian-inc.com/order/order/order_refund_callback"
 order.order.order_info = "http://order.test.yidian-inc.com/order/order/order_info"
@@ -332,7 +339,7 @@ wallet.account.third_account_bind = "http://wallet.test.yidian-inc.com/wallet/ac
 wallet.account.third_account = "http://wallet.test.yidian-inc.com/wallet/account/third_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.account.pingpp_callback = "http://wallet.test.yidian-inc.com/wallet/account/pingpp_callback"
+wallet.callback.withdraw = "http://wallet.test.yidian-inc.com/wallet/callback/withdraw"
 
 
 ;tcc调goods用子项目
@@ -390,11 +397,9 @@ merchant.enterprise.check_mobile_code   = "http://merchant.dev.yidian-inc.com/au
 merchant.enterprise.change_role   = "http://merchant.dev.yidian-inc.com/auth/enterprise/change_role"
 merchant.enterprise.delete_life_user   = "http://merchant.dev.yidian-inc.com/auth/enterprise/delete_life_user"
 
-
-merchant.recruitinner.create_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/create_recruit"
-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.add_enterprise  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/add_enterprise"
+merchant.recruitinner.update_enterprise  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/update_enterprise"
+merchant.recruitinner.get_enterprise  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 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"
 
@@ -509,6 +514,7 @@ 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"
+order.order.scanpurchase_userverify_url = "http://order.dev.yidian-inc.com/order/order/scanpurchase_userverify_url"
 order.order.order_pay_callback = "http://order.dev.yidian-inc.com/order/order/order_pay_callback"
 order.order.order_refund_callback = "http://order.dev.yidian-inc.com/order/order/order_refund_callback"
 order.order.order_info = "http://order.dev.yidian-inc.com/order/order/order_info"
@@ -531,7 +537,7 @@ wallet.account.third_account_bind = "http://wallet.dev.yidian-inc.com/wallet/acc
 wallet.account.third_account = "http://wallet.dev.yidian-inc.com/wallet/account/third_account"
 wallet.account.withdraw_validate = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_validate"
 wallet.account.withdraw_detail = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_detail"
-wallet.account.pingpp_callback = "http://wallet.dev.yidian-inc.com/wallet/account/pingpp_callback"
+wallet.callback.withdraw = "http://wallet.dev.yidian-inc.com/wallet/callback/withdraw"
 
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_try";

mysql.ini

@@ -93,20 +93,37 @@ merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_
 
 ; 生产环境
 [prod-goods : goods : common]
+goods.database_type='mysql'
+goods.database_name='goods'
+goods.connect_timeout=2
+goods.username='bp_goods_rw'
+goods.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+goods.charset='utf8mb4'
+goods.write.host='w.bp_goods.int.yidian-inc.com:3306'
+goods.read.host='r.bp_goods_1.int.yidian-inc.com:3306,r.bp_goods_2.int.yidian-inc.com:3306'
+
+marketing.database_type='mysql'
+marketing.database_name='marketing'
+marketing.connect_timeout=2
+marketing.username='bp_goods_rw'
+marketing.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+marketing.charset='utf8mb4'
+marketing.write.host='w.bp_goods.int.yidian-inc.com:3306'
+marketing.read.host='r.bp_goods_1.int.yidian-inc.com:3306,r.bp_goods_2.int.yidian-inc.com:3306'
 
 ; 预发环境
-[perf-goods : prod-goods : merchant : common]
+[perf-goods : prod-goods : goods : common]
 
 ; 测试环境
-[test-goods : merchant : common]
+[test-goods : goods : common]
 goods.database_type='mysql'
 goods.database_name='goods'
 goods.connect_timeout=2
 goods.username='bp_test_rw'
 goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 goods.charset='utf8mb4'
-goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
-goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+goods.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+goods.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 marketing.database_type='mysql'
 marketing.database_name='marketing'
@@ -114,11 +131,11 @@ marketing.connect_timeout=2
 marketing.username='bp_test_rw'
 marketing.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 marketing.charset='utf8mb4'
-marketing.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
-marketing.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+marketing.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+marketing.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 开发联调测试
-[dev-goods : merchant : common]
+[dev-goods : goods : common]
 goods.database_type='mysql'
 goods.database_name='goods'
 goods.connect_timeout=2