Authored by mali

Merge branch 'gray' into test6.9.13

... ... @@ -96,7 +96,7 @@ public class OrderHelpController {
} catch (Exception e) {
log.info("buyer Cancel fail {}", order, e);
}
sleep(50);
sleep(200);
});
return new ApiResponse.ApiResponseBuilder().code(200).message("处理成功").build();
}
... ...
... ... @@ -71,7 +71,6 @@ yoho.recovery.zkPath=/yh/config/recovery
wechat.app.partnerid=1218934901
wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9
wechat.app.appid=wx049fdaa3ba9cdd7a
wechat.notifyurl=http://testapi.yohops.com/payment/weixin_notify
... ...
... ... @@ -55,7 +55,6 @@ yoho.single.center.domain=${yoho.single.center.domain}
wechat.app.partnerid=1218934901
wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9
wechat.app.appid=wx049fdaa3ba9cdd7a
wechat.notifyurl=${wechat.notifyurl}
... ...