记得上下班打卡 | git大法好,push需谨慎

Commit 4dfeb069 authored by jiangxiulong's avatar jiangxiulong

增加callback token过滤 整理名称

parent a9016b43
...@@ -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
# ----------------------------------------------------------- # -----------------------------------------------------------
......
...@@ -28,10 +28,10 @@ public class PerformancesExpressCallbackController { ...@@ -28,10 +28,10 @@ public class PerformancesExpressCallbackController {
@Autowired @Autowired
private PerformancesExpressCallbackServiceImpl performancesExpressServiceImpl; private PerformancesExpressCallbackServiceImpl performancesExpressServiceImpl;
@PostMapping("OrderStatus") @PostMapping("orderStatus")
@ApiOperation("订单状态推送") @ApiOperation("订单状态推送")
public HashMap OrderStatus(PerformanceExpressPushStatusParam performanceExpressPushStatusParam) { public HashMap OrderStatus(PerformanceExpressPushStatusParam performanceExpressPushStatusParam) {
boolean result = performancesExpressServiceImpl.OrderStatus(performanceExpressPushStatusParam); boolean result = performancesExpressServiceImpl.orderStatus(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("listOrderRoute") @PostMapping("orderRoute")
@ApiOperation("路由推送") @ApiOperation("路由推送")
public HashMap listOrderRoute(PerformanceExpressPushRouteParam performanceExpressPushRouteParam) { public HashMap listOrderRoute(PerformanceExpressPushRouteParam performanceExpressPushRouteParam) {
boolean result = performancesExpressServiceImpl.listOrderRoute(performanceExpressPushRouteParam); boolean result = performancesExpressServiceImpl.orderRoute(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("getListFreight") @PostMapping("orderFreightList")
@ApiOperation("清单运费推送") @ApiOperation("清单运费推送")
public HashMap getListFreight(PerformanceExpressPushFreightParam performanceExpressPushFreightParam) { public HashMap getListFreight(PerformanceExpressPushFreightParam performanceExpressPushFreightParam) {
boolean result = performancesExpressServiceImpl.getListFreight(performanceExpressPushFreightParam); boolean result = performancesExpressServiceImpl.orderFreightList(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");
......
...@@ -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 listOrderRoute(PerformanceExpressPushRouteParam performanceExpressPushRouteParam) { public boolean orderRoute(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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment