记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
6c4759e7
Commit
6c4759e7
authored
Jul 21, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 httpClient request
parent
18fe0cc9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
9 deletions
+17
-9
HttpUtil.java
...c/main/java/com/liquidnet/commons/lang/util/HttpUtil.java
+15
-7
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+2
-2
No files found.
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java
View file @
6c4759e7
...
...
@@ -138,16 +138,24 @@ public class HttpUtil {
if
(
url
==
null
||
url
.
trim
().
isEmpty
())
{
return
null
;
}
HttpEntity
<
Object
>
httpEntity
;
if
(
headers
!=
null
)
{
// header
HttpHeaders
httpHeaders
=
new
HttpHeaders
();
if
(
headers
!=
null
)
{
httpHeaders
.
addAll
(
headers
);
httpHeaders
.
setContentType
(
mediaType
);
httpEntity
=
new
HttpEntity
(
params
,
httpHeaders
);
}
else
{
httpEntity
=
new
HttpEntity
(
params
,
null
);
}
HttpEntity
<
Object
>
httpEntity
=
new
HttpEntity
(
params
,
httpHeaders
);
// HttpEntity<Object> httpEntity;
// if (headers != null) {
// // header
// HttpHeaders httpHeaders = new HttpHeaders();
// httpHeaders.addAll(headers);
// httpHeaders.setContentType(mediaType);
// httpEntity = new HttpEntity(params, httpHeaders);
// } else {
// httpEntity = new HttpEntity(params, null);
// }
// 提交方式:表单、json
ResponseEntity
<
String
>
response
=
restTemplate
.
exchange
(
url
,
method
,
httpEntity
,
String
.
class
);
return
response
.
getBody
();
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
6c4759e7
...
...
@@ -311,6 +311,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
return
resultData
;
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
log
.
error
(
"Kylin Order Pay Error = "
+
e
.
getMessage
());
if
(
isDownGeneral
)
{
currentTime
=
System
.
currentTimeMillis
();
dataUtils
.
changeSurplusGeneral
(
payOrderParam
.
getTicketId
(),
payOrderParam
.
getNumber
());
...
...
@@ -326,8 +328,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
}
}
}
e
.
printStackTrace
();
log
.
error
(
"Kylin Order Pay Error = "
+
e
.
getMessage
());
redisLockUtil
.
unlock
(
lock
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20018"
));
//乱七八糟异常
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment