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

Commit 21fa5017 authored by jiangxiulong's avatar jiangxiulong

快递

parent 794b7d91
...@@ -35,7 +35,7 @@ public class PerformancesExpressCallbackController { ...@@ -35,7 +35,7 @@ public class PerformancesExpressCallbackController {
@PostMapping("orderStatus") @PostMapping("orderStatus")
@ApiOperation("订单状态推送") @ApiOperation("订单状态推送")
public HashMap OrderStatus(PerformanceExpressPushStatusParam performanceExpressPushStatusParam) { public HashMap OrderStatus(@RequestBody String 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) {
...@@ -48,7 +48,7 @@ public class PerformancesExpressCallbackController { ...@@ -48,7 +48,7 @@ public class PerformancesExpressCallbackController {
@PostMapping("orderRoute") @PostMapping("orderRoute")
@ApiOperation("路由推送") @ApiOperation("路由推送")
public HashMap listOrderRoute(PerformanceExpressPushRouteParam performanceExpressPushRouteParam) { public HashMap listOrderRoute(@RequestBody String performanceExpressPushRouteParam) {
boolean result = performancesExpressServiceImpl.orderRoute(performanceExpressPushRouteParam); boolean result = performancesExpressServiceImpl.orderRoute(performanceExpressPushRouteParam);
HashMap<Object, Object> objectObjectHashMap = new HashMap<>(); HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
if (result) { if (result) {
...@@ -61,7 +61,7 @@ public class PerformancesExpressCallbackController { ...@@ -61,7 +61,7 @@ public class PerformancesExpressCallbackController {
@PostMapping("orderFreightList") @PostMapping("orderFreightList")
@ApiOperation("清单运费推送") @ApiOperation("清单运费推送")
public HashMap getListFreight(PerformanceExpressPushFreightParam performanceExpressPushFreightParam) { public HashMap getListFreight(@RequestBody String performanceExpressPushFreightParam) {
boolean result = performancesExpressServiceImpl.orderFreightList(performanceExpressPushFreightParam); boolean result = performancesExpressServiceImpl.orderFreightList(performanceExpressPushFreightParam);
HashMap<Object, Object> objectObjectHashMap = new HashMap<>(); HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
if (result) { if (result) {
......
...@@ -77,9 +77,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd ...@@ -77,9 +77,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
public boolean orderStatus(PerformanceExpressPushStatusParam performanceExpressPushStatusParam) { public boolean orderStatus(String performanceExpressPushStatusParam) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(JsonUtils.toJson(performanceExpressPushStatusParam), httpServletRequest); boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushStatusParam, httpServletRequest);
System.out.println(performanceExpressPushStatusParam); System.out.println(performanceExpressPushStatusParam);
System.out.println(res); System.out.println(res);
...@@ -93,9 +93,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd ...@@ -93,9 +93,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
return false; return false;
} }
public boolean orderFreightList(PerformanceExpressPushFreightParam performanceExpressPushFreightParam) { public boolean orderFreightList(String performanceExpressPushFreightParam) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(JsonUtils.toJson(performanceExpressPushFreightParam), httpServletRequest); boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushFreightParam, httpServletRequest);
System.out.println(performanceExpressPushFreightParam); System.out.println(performanceExpressPushFreightParam);
System.out.println(res); System.out.println(res);
...@@ -118,9 +118,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd ...@@ -118,9 +118,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
return false; return false;
} }
public boolean orderRoute(PerformanceExpressPushRouteParam performanceExpressPushRouteParam) { public boolean orderRoute(String performanceExpressPushRouteParam) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(JsonUtils.toJson(performanceExpressPushRouteParam), httpServletRequest); boolean res = shunfengSignUtils.receiveRequestAndCheckSign(performanceExpressPushRouteParam, httpServletRequest);
System.out.println(performanceExpressPushRouteParam); System.out.println(performanceExpressPushRouteParam);
System.out.println(res); System.out.println(res);
......
...@@ -86,6 +86,8 @@ public class ShunfengSignUtils { ...@@ -86,6 +86,8 @@ public class ShunfengSignUtils {
} }
// 请求方参数+请求方时间戳+SK 生成签名 // 请求方参数+请求方时间戳+SK 生成签名
String thisSign = genSign(timestamp, params); String thisSign = genSign(timestamp, params);
System.out.println(params);
System.out.println(thisSign);
// 获取的签名和请求方签名比较是否一致 // 获取的签名和请求方签名比较是否一致
if (!thisSign.equals(sign)) { if (!thisSign.equals(sign)) {
System.out.println("签名错误"); System.out.println("签名错误");
......
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