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

interface.ini

@@ -309,6 +309,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"
@@ -340,6 +342,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" ;领取优惠券
@@ -413,7 +418,8 @@ service.tcc.sync = "http://tcc.test.yidian-inc.com/tcc/sync"
 ;======================= 1000000-test gateway微服务接口 ======================= 
 ;登陆上报地理位置
 merchant.user.binding_location = "http://merchant.test.yidian-inc.com/user/user/binding_location"
-
+yidian.push.android_binding_token = "http://a3.go2yd.com/Website/push/binding-token-for-android"
+yidian.push.ios_binding_token = "http://a3.go2yd.com/Website/push/binding-token"
 
 
 ;======================= 2000000-test merchant微服务接口 ======================= 
@@ -663,6 +669,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"
@@ -694,6 +702,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" ;领取优惠券
@@ -729,7 +740,8 @@ service.tcc.sync = "http://tcc.test.yidian-inc.com/tcc/sync"
 ;======================= 1000000-dev gateway微服务接口 ======================= 
 ;登陆上报地理位置
 merchant.user.binding_location = "http://merchant.dev.yidian-inc.com/user/user/binding_location"
-
+yidian.push.android_binding_token = "http://a3.go2yd.com/Website/push/binding-token-for-android"
+yidian.push.ios_binding_token = "http://a3.go2yd.com/Website/push/binding-token"
 
 ;======================= 2000000-dev merchant微服务接口 ======================= 
 merchant.personal.check = "http://merchant.dev.yidian-inc.com/auth/personal/check"
@@ -978,6 +990,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"
@@ -1009,6 +1023,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,7 +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'
+exclude.url[] = 'merchant/recruitinner/get_enterprise_info'
+exclude.url[] = 'lifeaccount/recruit/get_enterprise_info'
 
 [prod-wallet: wallet : common]
 

wallet.ini

@@ -8,7 +8,7 @@ withdraw.day_total_amount = 100000;
 ;Ping++轮训条数
 withdraw.pinpp_sync_limit = 100;
 ;提现审核阈值，超过进审核列表 单位 分
-withdraw.withdraw_apply_amount = 10;
+withdraw.withdraw_apply_amount = 500;
 ;关闭提现 0 打开 1 关闭
 withdraw.is_closed = 0;
 ;白名单用户