ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit 79a40fd3de5c77fb833e84f83c15ec35fff5f210 2 parents 6290d79e eb5a0396

Merge branch 'gray' into test6.9.13

Inline Side-by-side
Showing 3 changed files with 1 additions and 3 deletions
@@ -96,7 +96,7 @@ public class OrderHelpController { @@ -96,7 +96,7 @@ public class OrderHelpController {
96 } catch (Exception e) { 96 } catch (Exception e) {
97 log.info("buyer Cancel fail {}", order, e); 97 log.info("buyer Cancel fail {}", order, e);
98 } 98 }
99 - sleep(50); 99 + sleep(200);
100 }); 100 });
101 return new ApiResponse.ApiResponseBuilder().code(200).message("处理成功").build(); 101 return new ApiResponse.ApiResponseBuilder().code(200).message("处理成功").build();
102 } 102 }
@@ -71,7 +71,6 @@ yoho.recovery.zkPath=/yh/config/recovery @@ -71,7 +71,6 @@ yoho.recovery.zkPath=/yh/config/recovery
71 71
72 72
73 wechat.app.partnerid=1218934901 73 wechat.app.partnerid=1218934901
74 -wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9  
75 wechat.app.appid=wx049fdaa3ba9cdd7a 74 wechat.app.appid=wx049fdaa3ba9cdd7a
76 75
77 wechat.notifyurl=http://testapi.yohops.com/payment/weixin_notify 76 wechat.notifyurl=http://testapi.yohops.com/payment/weixin_notify
@@ -55,7 +55,6 @@ yoho.single.center.domain=${yoho.single.center.domain} @@ -55,7 +55,6 @@ yoho.single.center.domain=${yoho.single.center.domain}
55 55
56 56
57 wechat.app.partnerid=1218934901 57 wechat.app.partnerid=1218934901
58 -wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9  
59 wechat.app.appid=wx049fdaa3ba9cdd7a 58 wechat.app.appid=wx049fdaa3ba9cdd7a
60 59
61 wechat.notifyurl=${wechat.notifyurl} 60 wechat.notifyurl=${wechat.notifyurl}