Merge branch 'test'

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinPerformanceStatusEnum.java

@@ -4,6 +4,7 @@ package com.liquidnet.service.kylin.constant;
  * 演出状态文案
  */
 public enum KylinPerformanceStatusEnum {
+    PERFORMANCESTATUS3("预览", 3),
     PERFORMANCESTATUS6("购买", 6),
     PERFORMANCESTATUS7("已下架", 7),
     PERFORMANCESTATUS8("售馨", 8),

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/task/FeignPlatformTaskClient.java

@@ -9,7 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 @Component
 @FeignClient(name = "liquidnet-service-platform",
         contextId = "FeignPlatformTaskClient", path = "",
-        url = "${liquidnet.url.platform}",
+//        url = "${liquidnet.url.platform}",
+        url = "",
         fallback = FallbackFactory.Default.class)
 public interface FeignPlatformTaskClient {
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/express/shunfeng/PerformancesExpressCallbackController.java

@@ -35,7 +35,7 @@ public class PerformancesExpressCallbackController {
 
     @PostMapping("orderStatus")
     @ApiOperation("订单状态推送")
-    public HashMap OrderStatus(PerformanceExpressPushStatusParam performanceExpressPushStatusParam) {
+    public HashMap OrderStatus(@RequestBody String performanceExpressPushStatusParam) {
         boolean result = performancesExpressServiceImpl.orderStatus(performanceExpressPushStatusParam);
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
         if (result) {
@@ -48,7 +48,7 @@ public class PerformancesExpressCallbackController {
 
     @PostMapping("orderRoute")
     @ApiOperation("路由推送")
-    public HashMap listOrderRoute(PerformanceExpressPushRouteParam performanceExpressPushRouteParam) {
+    public HashMap listOrderRoute(@RequestBody String performanceExpressPushRouteParam) {
         boolean result = performancesExpressServiceImpl.orderRoute(performanceExpressPushRouteParam);
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
         if (result) {
@@ -61,7 +61,7 @@ public class PerformancesExpressCallbackController {
 
     @PostMapping("orderFreightList")
     @ApiOperation("清单运费推送")
-    public HashMap getListFreight(PerformanceExpressPushFreightParam performanceExpressPushFreightParam) {
+    public HashMap getListFreight(@RequestBody String performanceExpressPushFreightParam) {
         boolean result = performancesExpressServiceImpl.orderFreightList(performanceExpressPushFreightParam);
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
         if (result) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java

@@ -77,9 +77,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
     @Autowired
     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(res);
 
@@ -93,9 +93,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
         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(res);
 
@@ -118,9 +118,9 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
         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(res);
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ShunfengSignUtils.java

@@ -86,6 +86,8 @@ public class ShunfengSignUtils {
         }
         // 请求方参数+请求方时间戳+SK 生成签名
         String thisSign = genSign(timestamp, params);
+        System.out.println(params);
+        System.out.println(thisSign);
         // 获取的签名和请求方签名比较是否一致
         if (!thisSign.equals(sign)) {
             System.out.println("签名错误");