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

dictionary

-[trade_type]

dictionary.ini

+[trade_type]
+101="平台抽成"
+102="商品交易"
+103="商户营销补贴"
+104="平台营销补贴"
+105="团长佣金收入"
+106="平台活动补贴"
+201="余额提现"
+301="平台营销补贴"
+302="商品交易"
+303="商品营销补贴"
+304="第三方渠道手续费"
+305="团长佣金收入"
+401="平台营销补贴"
+402="平台活动补贴"
+403="商户营销补贴"
+404="团长佣金收入"
+405="平台抽成"
+406="第三方渠道手续费"
+407="商品交易"
+501="平台营销充值"
+502="商户营销充值"

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

@@ -18,13 +18,14 @@ service.session.set             = "http://a4.go2yd.com/Website/session/set-sessi
 service.session.delete          = "http://a4.go2yd.com/Website/session/delete-session"
 service.session.mget            = "http://a4.go2yd.com/Website/session/get-many-session"
 
-;简网用户信息,目前测试域名，后期换成生产内网域名！！！
-service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
-service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
-service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
-service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
-service.jw_user.save_push_token = "http://testblend.jwshq.cn/ydInnerToken/savePushToken"
-service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount/saveOrUpdateLifeAccount"
+;简网用户信息
+service.jw_user.get_user_info       = "http://blend.jwshq.yidian-inc.com/ydInner/getUserInfoByMobile"
+service.jw_user.get_all_city_tree   = "http://blend.jwshq.yidian-inc.com/ydInner/getAllCityTree"
+service.jw_user.get_user_info_by_user_id   = "http://blend.jwshq.yidian-inc.com/ydInner/getUserInfoByUserId"
+service.jw_user.get_user_list   = "http://blend.jwshq.yidian-inc.com/ydInner/getUserList"
+service.jw_user.save_push_token = "http://blend.jwshq.yidian-inc.com/ydInnerToken/savePushToken"
+service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
+service.jw_user.get_user_digg   = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
 
 ;idgen发号器
 service.idgen = "http://idgen.int.yidian-inc.com/id/get"
@@ -67,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"
 
@@ -115,7 +116,17 @@ interaction.index.follow_list = "http://interact.int.yidian-inc.com/follow/index
 interaction.index.is_follow = "http://interact.int.yidian-inc.com/follow/index/is_follow"
 interaction.inner.digg = "http://interact.int.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interact.int.yidian-inc.com/follow/index/get_count_and_isfollow"
+;互动调用生活号
+merchant.account.get_role_list  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_role_list"
+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]
 
@@ -134,12 +145,15 @@ service.session.delete          = "http://a4-1.go2yd.com/Website/session/delete-
 service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-many-session"
 
 ;简网用户信息
-service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
-service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
-service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
-service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
-service.jw_user.save_push_token = "http://testblend.jwshq.cn/ydInnerToken/savePushToken"
-service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount/saveOrUpdateLifeAccount"
+service.jw_user.get_user_info       = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserInfoByMobile"
+service.jw_user.get_all_city_tree   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getAllCityTree"
+service.jw_user.get_user_info_by_user_id   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserInfoByUserId"
+service.jw_user.get_user_list   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserList"
+service.jw_user.save_push_token = "http://blend-test.api.appgc.yidian-inc.com/ydInnerToken/savePushToken"
+service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
+service.jw_user.get_user_digg   = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
+
+
 
 ;idgen发号器
 service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
@@ -185,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"
 
@@ -233,6 +247,10 @@ interaction.index.follow_list = "http://interaction.test.yidian-inc.com/follow/i
 interaction.index.is_follow = "http://interaction.test.yidian-inc.com/follow/index/is_follow"
 interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
+;互动调用生活号
+merchant.account.get_role_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
+merchant.account.get_life_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_list"
+merchant.account.get_user_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_user_list"
 
 ;门店
 goods.shop.add_shop = "http://goods.test.int.yidian-inc.com/shop/shop/add_shop"
@@ -255,14 +273,16 @@ goods.marketing.get_marketing_goods_list = "http://goods.test.int.yidian-inc.com
 
 
 ;团长
-goods.marketing.second_distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/second_distributor_list"
-goods.marketing.apply_distributor = "http://goods.test.yidian-inc.com/marketing/distributor/apply_distributor"
-goods.marketing.apply_second_distributor = "http://goods.test.yidian-inc.com/marketing/distributor/apply_second_distributor"
-goods.marketing.send_sms_code = "http://goods.test.yidian-inc.com/marketing/distributor/send_sms_code"
-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.second_distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/second_distributor_list"
+goods.marketing.apply_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_distributor"
+goods.marketing.apply_second_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_second_distributor"
+goods.marketing.send_sms_code = "http://goods.test.int.yidian-inc.com/marketing/distributor/send_sms_code"
+goods.marketing.distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor"
+goods.marketing.distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_list"
+goods.marketing.distributor_code_url = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
+goods.wx.appgc = "https://wx.appgc.cn"
+goods.api.jwshq = "http://api.jwshq.cn"
  
 ;商品
 goods.public.get_goods_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_category_list"
@@ -279,9 +299,12 @@ goods.consumer.goods_list_c = "http://goods.test.int.yidian-inc.com/goods/goods/
 goods.consumer.goods_list_es = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_es"
 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.consumer.pay_success_callback = "http://goods.test.int.yidian-inc.com/goods/goods/pay_success_callback"
+goods.consumer.init_shop = "http://goods.test.int.yidian-inc.com/goods/goods/init_shop"
 
 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"
+goods.public.get_goods_sku = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_sku"
 
 
 ;订单
@@ -294,6 +317,11 @@ 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"
+
 
 ;支付
 pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
@@ -304,8 +332,14 @@ 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.withdraw = "http://wallet.test.yidian-inc.com/wallet/account/withdraw"
 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"
+wallet.account.third_account_bind = "http://wallet.test.yidian-inc.com/wallet/account/third_account_bind"
+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.callback.withdraw = "http://wallet.test.yidian-inc.com/wallet/callback/withdraw"
 
 
 ;tcc调goods用子项目
@@ -363,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"
 
@@ -411,6 +443,10 @@ interaction.index.follow_list = "http://interaction.dev.yidian-inc.com/follow/in
 interaction.index.is_follow = "http://interaction.dev.yidian-inc.com/follow/index/is_follow"
 interaction.inner.digg = "http://interaction.dev.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.com/follow/index/get_count_and_isfollow"
+;互动调用生活号
+merchant.account.get_role_list  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
+merchant.account.get_life_list  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_list"
+merchant.account.get_user_list  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_user_list"
 
 ;门店
 goods.shop.add_shop = "http://goods.dev.yidian-inc.com/shop/shop/add_shop"
@@ -442,7 +478,9 @@ goods.marketing.distributor = "http://goods.dev.yidian-inc.com/marketing/distrib
 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"
-
+goods.wx.appgc = "https://wx.appgc.cn"
+goods.api.jwshq = "http://api.jwshq.cn"
+ 
 
 ;商品
 goods.public.get_goods_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_category_list"
@@ -459,10 +497,12 @@ goods.consumer.goods_list_c = "http://goods.dev.yidian-inc.com/goods/goods/goods
 goods.consumer.goods_list_es = "http://goods.dev.yidian-inc.com/goods/goods/goods_list_es"
 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.consumer.pay_success_callback = "http://goods.dev.yidian-inc.com/goods/goods/pay_success_callback"
+goods.consumer.init_shop = "http://goods.dev.yidian-inc.com/goods/goods/init_shop"
 
 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"
-
+goods.public.get_goods_sku = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_sku"
 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
@@ -474,6 +514,11 @@ 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"
+
 
 
 ;支付
@@ -485,8 +530,14 @@ 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.withdraw = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw"
 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"
+wallet.account.third_account_bind = "http://wallet.dev.yidian-inc.com/wallet/account/third_account_bind"
+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.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";
@@ -556,24 +607,7 @@ order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_or
 ; =======================  interaction ==================================================================================
 
 [prod-interaction : prod]
-merchant.account.get_role_list  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_role_list"
-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"
-service.jw_user.get_user_dynamic   = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
-service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
-
 [perf-interaction : perf]
-
 [test-interaction : test]
-merchant.account.get_role_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
-merchant.account.get_life_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_list"
-merchant.account.get_user_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_user_list"
-service.jw_user.get_user_dynamic   = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
-service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
-
 [dev-interaction : dev]
-merchant.account.get_role_list  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
-merchant.account.get_life_list  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_list"
-merchant.account.get_user_list  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_user_list"
-service.jw_user.get_user_dynamic   = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
-service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
+

mysql.ini

@@ -79,25 +79,51 @@ interaction.charset='utf8mb4'
 interaction.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 interaction.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
+merchant.database_type='mysql'
+merchant.database_name='merchant'
+merchant.connect_timeout=2
+merchant.username='bp_test_rw'
+merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+merchant.charset='utf8mb4'
+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'
+
 
 [goods : common]
 
 ; 生产环境
 [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_rw'
 goods.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 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'
@@ -105,11 +131,11 @@ marketing.connect_timeout=2
 marketing.username='bp_rw'
 marketing.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 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

pay.ini

+[common]
+;支付订单有效时长
+pay.expire_time         = 1800;
+pay.wechat_rate         = 60;
+pay.wechat_account_id   = 10010;