记得上下班打卡 | 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
4dfeb069
Commit
4dfeb069
authored
Jun 30, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加callback token过滤 整理名称
parent
a9016b43
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
17 deletions
+22
-17
liquidnet-service-platform.yml
...us-config/liquidnet-config/liquidnet-service-platform.yml
+5
-1
PerformancesExpressCallbackController.java
...press/shunfeng/PerformancesExpressCallbackController.java
+6
-6
PerformancesExpressCallbackServiceImpl.java
...ress/shunfeng/PerformancesExpressCallbackServiceImpl.java
+11
-10
No files found.
liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml
View file @
4dfeb069
...
@@ -136,8 +136,12 @@ global-auth:
...
@@ -136,8 +136,12 @@ global-auth:
-
${liquidnet.info.context}/webjars/**
-
${liquidnet.info.context}/webjars/**
-
${liquidnet.info.context}/swagger-resources/**
-
${liquidnet.info.context}/swagger-resources/**
-
${liquidnet.info.context}/v2/api-docs*
-
${liquidnet.info.context}/v2/api-docs*
# 退款回
掉
# 退款回
调
-
${liquidnet.info.context}/refund/callback
-
${liquidnet.info.context}/refund/callback
# shunfeng快递推送
-
${liquidnet.info.context}/performancesExpress/orderStatus
-
${liquidnet.info.context}/performancesExpress/orderRoute
-
${liquidnet.info.context}/performancesExpress/orderFreightList
# -----------------------------------------------------------
# -----------------------------------------------------------
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/express/shunfeng/PerformancesExpressCallbackController.java
View file @
4dfeb069
...
@@ -28,10 +28,10 @@ public class PerformancesExpressCallbackController {
...
@@ -28,10 +28,10 @@ public class PerformancesExpressCallbackController {
@Autowired
@Autowired
private
PerformancesExpressCallbackServiceImpl
performancesExpressServiceImpl
;
private
PerformancesExpressCallbackServiceImpl
performancesExpressServiceImpl
;
@PostMapping
(
"
O
rderStatus"
)
@PostMapping
(
"
o
rderStatus"
)
@ApiOperation
(
"订单状态推送"
)
@ApiOperation
(
"订单状态推送"
)
public
HashMap
OrderStatus
(
PerformanceExpressPushStatusParam
performanceExpressPushStatusParam
)
{
public
HashMap
OrderStatus
(
PerformanceExpressPushStatusParam
performanceExpressPushStatusParam
)
{
boolean
result
=
performancesExpressServiceImpl
.
O
rderStatus
(
performanceExpressPushStatusParam
);
boolean
result
=
performancesExpressServiceImpl
.
o
rderStatus
(
performanceExpressPushStatusParam
);
HashMap
<
Object
,
Object
>
objectObjectHashMap
=
new
HashMap
<>();
HashMap
<
Object
,
Object
>
objectObjectHashMap
=
new
HashMap
<>();
if
(
result
)
{
if
(
result
)
{
objectObjectHashMap
.
put
(
"status"
,
"OK"
);
objectObjectHashMap
.
put
(
"status"
,
"OK"
);
...
@@ -41,10 +41,10 @@ public class PerformancesExpressCallbackController {
...
@@ -41,10 +41,10 @@ public class PerformancesExpressCallbackController {
return
objectObjectHashMap
;
return
objectObjectHashMap
;
}
}
@PostMapping
(
"
listO
rderRoute"
)
@PostMapping
(
"
o
rderRoute"
)
@ApiOperation
(
"路由推送"
)
@ApiOperation
(
"路由推送"
)
public
HashMap
listOrderRoute
(
PerformanceExpressPushRouteParam
performanceExpressPushRouteParam
)
{
public
HashMap
listOrderRoute
(
PerformanceExpressPushRouteParam
performanceExpressPushRouteParam
)
{
boolean
result
=
performancesExpressServiceImpl
.
listO
rderRoute
(
performanceExpressPushRouteParam
);
boolean
result
=
performancesExpressServiceImpl
.
o
rderRoute
(
performanceExpressPushRouteParam
);
HashMap
<
Object
,
Object
>
objectObjectHashMap
=
new
HashMap
<>();
HashMap
<
Object
,
Object
>
objectObjectHashMap
=
new
HashMap
<>();
if
(
result
)
{
if
(
result
)
{
objectObjectHashMap
.
put
(
"status"
,
"OK"
);
objectObjectHashMap
.
put
(
"status"
,
"OK"
);
...
@@ -54,10 +54,10 @@ public class PerformancesExpressCallbackController {
...
@@ -54,10 +54,10 @@ public class PerformancesExpressCallbackController {
return
objectObjectHashMap
;
return
objectObjectHashMap
;
}
}
@PostMapping
(
"
getListFreigh
t"
)
@PostMapping
(
"
orderFreightLis
t"
)
@ApiOperation
(
"清单运费推送"
)
@ApiOperation
(
"清单运费推送"
)
public
HashMap
getListFreight
(
PerformanceExpressPushFreightParam
performanceExpressPushFreightParam
)
{
public
HashMap
getListFreight
(
PerformanceExpressPushFreightParam
performanceExpressPushFreightParam
)
{
boolean
result
=
performancesExpressServiceImpl
.
getListFreigh
t
(
performanceExpressPushFreightParam
);
boolean
result
=
performancesExpressServiceImpl
.
orderFreightLis
t
(
performanceExpressPushFreightParam
);
HashMap
<
Object
,
Object
>
objectObjectHashMap
=
new
HashMap
<>();
HashMap
<
Object
,
Object
>
objectObjectHashMap
=
new
HashMap
<>();
if
(
result
)
{
if
(
result
)
{
objectObjectHashMap
.
put
(
"status"
,
"OK"
);
objectObjectHashMap
.
put
(
"status"
,
"OK"
);
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java
View file @
4dfeb069
...
@@ -64,7 +64,16 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
...
@@ -64,7 +64,16 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
@Autowired
@Autowired
HttpServletRequest
httpServletRequest
;
HttpServletRequest
httpServletRequest
;
public
boolean
getListFreight
(
PerformanceExpressPushFreightParam
performanceExpressPushFreightParam
)
{
public
boolean
orderStatus
(
PerformanceExpressPushStatusParam
performanceExpressPushStatusParam
)
{
boolean
res
=
shunfengSignUtils
.
receiveRequestAndCheckSign
(
JsonUtils
.
toJson
(
performanceExpressPushStatusParam
),
httpServletRequest
);
System
.
out
.
println
(
performanceExpressPushStatusParam
);
System
.
out
.
println
(
res
);
return
false
;
}
public
boolean
orderFreightList
(
PerformanceExpressPushFreightParam
performanceExpressPushFreightParam
)
{
boolean
res
=
shunfengSignUtils
.
receiveRequestAndCheckSign
(
JsonUtils
.
toJson
(
performanceExpressPushFreightParam
),
httpServletRequest
);
boolean
res
=
shunfengSignUtils
.
receiveRequestAndCheckSign
(
JsonUtils
.
toJson
(
performanceExpressPushFreightParam
),
httpServletRequest
);
System
.
out
.
println
(
performanceExpressPushFreightParam
);
System
.
out
.
println
(
performanceExpressPushFreightParam
);
...
@@ -82,7 +91,7 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
...
@@ -82,7 +91,7 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
return
false
;
return
false
;
}
}
public
boolean
listO
rderRoute
(
PerformanceExpressPushRouteParam
performanceExpressPushRouteParam
)
{
public
boolean
o
rderRoute
(
PerformanceExpressPushRouteParam
performanceExpressPushRouteParam
)
{
boolean
res
=
shunfengSignUtils
.
receiveRequestAndCheckSign
(
JsonUtils
.
toJson
(
performanceExpressPushRouteParam
),
httpServletRequest
);
boolean
res
=
shunfengSignUtils
.
receiveRequestAndCheckSign
(
JsonUtils
.
toJson
(
performanceExpressPushRouteParam
),
httpServletRequest
);
System
.
out
.
println
(
performanceExpressPushRouteParam
);
System
.
out
.
println
(
performanceExpressPushRouteParam
);
...
@@ -103,12 +112,4 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
...
@@ -103,12 +112,4 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
return
false
;
return
false
;
}
}
public
boolean
OrderStatus
(
PerformanceExpressPushStatusParam
performanceExpressPushStatusParam
)
{
boolean
res
=
shunfengSignUtils
.
receiveRequestAndCheckSign
(
JsonUtils
.
toJson
(
performanceExpressPushStatusParam
),
httpServletRequest
);
System
.
out
.
println
(
performanceExpressPushStatusParam
);
System
.
out
.
println
(
res
);
return
false
;
}
}
}
\ No newline at end of file
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