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

interface.ini

@@ -152,6 +152,7 @@ goods.public.get_marketing_list = "http://goods.int.yidian-inc.com/marketing/mar
 goods.public.get_distributor = "http://goods.int.yidian-inc.com/marketing/distributor/get_distributor"
 goods.public.pindan_goods = "http://goods.int.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.int.yidian-inc.com/user/user/user_wechat_bind"
+goods.public.take_place_by_goods_sku_ids = "http://goods.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
 
 
 ;团长
@@ -253,8 +254,11 @@ order.user.is_new_user = "http://order.int.yidian-inc.com/order/order/is_new_use
 order.order.wx_share_code = "http://order.int.yidian-inc.com/order/order/wx_share_code"
 order.marketing.marketing_order_list = "http://order.int.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.int.yidian-inc.com/order/order/order_confirm_page"
+order.order.have_buy_order_statistics = "http://order.int.yidian-inc.com/order/orderitem/have_buy_order_statistics"
+order.order.have_buy_goods_user_count = "http://order.int.yidian-inc.com/order/orderitem/have_buy_goods_user_count"
 order.order.pindan_data_statistics = "http://order.int.yidian-inc.com/order/Marketing/marketing_sale_count"
 
+
 ;新订单后台
 order.order.order_list = "http://order.int.yidian-inc.com/order/order/order_list"
 order.order.order_item_list = "http://order.int.yidian-inc.com/order/order/order_item_list"
@@ -297,6 +301,8 @@ order.deliverer.list_day_deliverer = "http://order.int.yidian-inc.com/deliverer/
 order.deliverer.save_day_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
 order.deliverer.list_day_deliverer_conf = "http://order.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 order.deliverer.plan_down = "http://order.int.yidian-inc.com/deliverer/deliverer/plan_down"
+order.deliverer.build_plan = "http://order.int.yidian-inc.com/deliverer/deliverer/build_plan"
+order.deliverer.plan_down_log = "http://order.int.yidian-inc.com/deliverer/deliverer/plan_down_log"
 ;======================= 6000000-prod pay微服务接口 ======================= 
 pay.order.pay = "http://pay.int.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.int.yidian-inc.com/pay/order/refund"
@@ -328,6 +334,9 @@ wallet.withdrawbackground.record_list = "http://wallet.int.yidian-inc.com/wallet
 wallet.historyapi.sendmsg = "https://ex.jwshq.cn/app/msg/sendMessage"
 wallet.withdrawbackground.account_list = "http://wallet.int.yidian-inc.com/wallet/background/account_list"
 wallet.accountbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/background/account_record_list"
+wallet.accountbackground.get_wallet_account_status = "http://wallet.int.yidian-inc.com/wallet/background/get_wallet_account_status"
+wallet.accountbackground.reset_wallet_account_status = "http://wallet.int.yidian-inc.com/wallet/background/reset_wallet_account_status"
+wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -552,6 +561,7 @@ goods.public.get_marketing_list = "http://goods.test.int.yidian-inc.com/marketin
 goods.public.get_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/get_distributor"
 goods.public.pindan_goods = "http://goods.test.int.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.test.int.yidian-inc.com/user/user/user_wechat_bind"
+goods.public.take_place_by_goods_sku_ids = "http://goods.test.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
 
 goods.goods.refund = "http://goods.test.int.yidian-inc.com/goods/goods/refund"
 
@@ -595,6 +605,8 @@ order.user.is_new_user = "http://order.test.yidian-inc.com/order/order/is_new_us
 order.order.wx_share_code = "http://order.test.yidian-inc.com/order/order/wx_share_code"
 order.marketing.marketing_order_list = "http://order.test.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.test.yidian-inc.com/order/order/order_confirm_page"
+order.order.have_buy_order_statistics = "http://order.test.yidian-inc.com/order/orderitem/have_buy_order_statistics"
+order.order.have_buy_goods_user_count = "http://order.test.yidian-inc.com/order/orderitem/have_buy_goods_user_count"
 order.order.pindan_data_statistics = "http://order.test.yidian-inc.com/order/Marketing/marketing_sale_count"
 
 ;新订单后台
@@ -640,6 +652,8 @@ order.deliverer.list_day_deliverer = "http://order.test.yidian-inc.com/deliverer
 order.deliverer.save_day_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
 order.deliverer.list_day_deliverer_conf = "http://order.test.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 order.deliverer.plan_down = "http://order.test.yidian-inc.com/deliverer/deliverer/plan_down"
+order.deliverer.build_plan = "http://order.test.yidian-inc.com/deliverer/deliverer/build_plan"
+order.deliverer.plan_down_log = "http://order.test.yidian-inc.com/deliverer/deliverer/plan_down_log"
 ;======================= 6000000-test pay微服务接口 ======================= 
 pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.test.yidian-inc.com/pay/order/refund"
@@ -671,6 +685,9 @@ wallet.withdrawbackground.record_list = "http://wallet.test.yidian-inc.com/walle
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
 wallet.withdrawbackground.account_list = "http://wallet.test.yidian-inc.com/wallet/background/account_list"
 wallet.accountbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/account_record_list"
+wallet.accountbackground.get_wallet_account_status = "http://wallet.test.yidian-inc.com/wallet/background/get_wallet_account_status"
+wallet.accountbackground.reset_wallet_account_status = "http://wallet.test.yidian-inc.com/wallet/background/reset_wallet_account_status"
+wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
 
 ;======================== 9000000-prod coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -860,6 +877,8 @@ goods.public.get_marketing_list = "http://goods.dev.yidian-inc.com/marketing/mar
 goods.public.get_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/get_distributor"
 goods.public.pindan_goods = "http://goods.dev.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.dev.yidian-inc.com/user/user/user_wechat_bind"
+goods.public.take_place_by_goods_sku_ids = "http://goods.dev.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
+
 
 goods.goods.refund = "http://goods.dev.yidian-inc.com/goods/goods/refund"
 
@@ -901,6 +920,8 @@ order.user.is_new_user = "http://order.dev.yidian-inc.com/order/order/is_new_use
 order.order.wx_share_code = "http://order.dev.yidian-inc.com/order/order/wx_share_code"
 order.marketing.marketing_order_list = "http://order.dev.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.dev.yidian-inc.com/order/order/order_confirm_page"
+order.order.have_buy_order_statistics = "http://order.dev.yidian-inc.com/order/orderitem/have_buy_order_statistics"
+order.order.have_buy_goods_user_count = "http://order.dev.yidian-inc.com/order/orderitem/have_buy_goods_user_count"
 order.order.pindan_data_statistics = "http://order.dev.yidian-inc.com/order/Marketing/marketing_sale_count"
 
 ;新订单后台
@@ -945,6 +966,8 @@ order.deliverer.list_day_deliverer = "http://order.dev.yidian-inc.com/deliverer/
 order.deliverer.save_day_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
 order.deliverer.list_day_deliverer_conf = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 order.deliverer.plan_down = "http://order.dev.yidian-inc.com/deliverer/deliverer/plan_down"
+order.deliverer.build_plan = "http://order.dev.yidian-inc.com/deliverer/deliverer/build_plan"
+order.deliverer.plan_down_log = "http://order.dev.yidian-inc.com/deliverer/deliverer/plan_down_log"
 ;======================= 6000000-dev pay微服务接口 ======================= 
 pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.dev.yidian-inc.com/pay/order/refund"
@@ -976,6 +999,9 @@ wallet.withdrawbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
 wallet.withdrawbackground.account_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_list"
 wallet.accountbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_record_list"
+wallet.accountbackground.get_wallet_account_status = "http://wallet.dev.yidian-inc.com/wallet/background/get_wallet_account_status"
+wallet.accountbackground.reset_wallet_account_status = "http://wallet.dev.yidian-inc.com/wallet/background/reset_wallet_account_status"
+wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 

mysql.ini

@@ -264,8 +264,8 @@ commerce.connect_timeout=2
 commerce.username='commerce_rw'
 commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
 commerce.charset='utf8mb4'
-commerce.write.host='10.9.155.216:4066'
-commerce.read.host='10.9.155.216:4066'
+commerce.write.host='commerce.db.appgc.yidian-inc.com:4066'
+commerce.read.host='commerce.db.appgc.yidian-inc.com:4066'
 
 
 ; 生活号 接龙拼单 用户信息
@@ -300,8 +300,8 @@ commerce.connect_timeout=2
 commerce.username='commerce_rw'
 commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
 commerce.charset='utf8mb4'
-commerce.write.host='10.9.155.216:4066'
-commerce.read.host='10.9.155.216:4066'
+commerce.write.host='commerce.db.appgc.yidian-inc.com:4066'
+commerce.read.host='commerce.db.appgc.yidian-inc.com:4066'
 
 
 ; 生活号 接龙拼单 用户信息
@@ -311,8 +311,8 @@ zhiyue.connect_timeout=2
 zhiyue.username='zhiyue_ro'
 zhiyue.password='s5JEh#FUvX%7P3sO9ZDQw&cpH$Xr8Q'
 zhiyue.charset='utf8mb4'
-zhiyue.write.host='10.9.110.120:4066'
-zhiyue.read.host='10.9.110.120:4066'
+zhiyue.write.host='zhiyue-slave.db.appgc.yidian-inc.com:4066'
+zhiyue.read.host='zhiyue-slave.db.appgc.yidian-inc.com:4066'
 
 ; 开发联调测试
 [dev-order : order : common]
@@ -345,8 +345,8 @@ zhiyue.connect_timeout=2
 zhiyue.username='zhiyue_ro'
 zhiyue.password='s5JEh#FUvX%7P3sO9ZDQw&cpH$Xr8Q'
 zhiyue.charset='utf8mb4'
-zhiyue.write.host='10.9.110.120:4066'
-zhiyue.read.host='10.9.110.120:4066'
+zhiyue.write.host='zhiyue-slave.db.appgc.yidian-inc.com:4066'
+zhiyue.read.host='zhiyue-slave.db.appgc.yidian-inc.com:4066'
 
 
 

request.ini

@@ -9,6 +9,8 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [prod-merchant : merchant : common]
 [prod-interaction : interaction : common]
 [prod-gateway: gateway : common]
+exclude.url[] = '/merchant/recruitinner/get_enterprise_info'
+
 [prod-wallet: wallet : common]
 
 ; 预发环境