Toggle navigation
Toggle navigation
This project
Loading...
Sign in
ufo
/
yohoufo-fore
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
mali
2019-10-16 11:31:56 +0800
Commit
79a40fd3de5c77fb833e84f83c15ec35fff5f210
2 parents
6290d79e
eb5a0396
Merge branch 'gray' into test6.9.13
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 additions
and
3 deletions
order/src/main/java/com/yohoufo/order/controller/OrderHelpController.java
web/src/main/resources/config.properties
web/src/main/webapp/META-INF/autoconf/config.properties
order/src/main/java/com/yohoufo/order/controller/OrderHelpController.java
View file @
79a40fd
...
...
@@ -96,7 +96,7 @@ public class OrderHelpController {
}
catch
(
Exception
e
)
{
log
.
info
(
"buyer Cancel fail {}"
,
order
,
e
);
}
sleep
(
5
0
);
sleep
(
20
0
);
});
return
new
ApiResponse
.
ApiResponseBuilder
().
code
(
200
).
message
(
"处理成功"
).
build
();
}
...
...
web/src/main/resources/config.properties
View file @
79a40fd
...
...
@@ -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
...
...
web/src/main/webapp/META-INF/autoconf/config.properties
View file @
79a40fd
...
...
@@ -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}
...
...
Please
register
or
login
to post a comment