Merge branch 'han' into server-165

拉取最新代码

service-issue/service-issue-biz/src/main/java/com/usky/issue/annotation/CheckSignAspect.java

@@ -1,5 +1,6 @@
 package com.usky.issue.annotation;
 
+import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.utils.StringUtils;
 import com.usky.issue.service.util.SignUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -47,25 +48,29 @@ public class CheckSignAspect {
             String sign = request.getHeader("sign");//获取sign参数
 
             if (StringUtils.isBlank(timestamp) || StringUtils.isBlank(sign)) {
-                return "timestamp和sign参数不能为空";
+                return ApiResult.success("timestamp和sign参数不能为空");
             }
             long requestTime = Long.valueOf(timestamp);
             long now = System.currentTimeMillis() / 1000;
             log.info("now={}", now);
             // 请求发起时间与当前时间超过expireTime，则接口请求过期
             if (now - requestTime > expireTime) {
-                return "接口请求过期";
+                return ApiResult.success("接口请求过期");
             }
 
             String generatedSign = generatedSignature(request, timestamp);
             if (!generatedSign.equals(sign)) {
-                return "签名校验错误";
+                return ApiResult.success("签名校验错误");
             }
-
-            Object result = joinPoint.proceed();
+            Object[] args = joinPoint.getArgs();
+            String originalValue = (String) args[0];
+            StringBuilder sb = new StringBuilder(originalValue);
+            sb.insert(sb.length()-1, ",\"companyCode\":\"10111\"");
+            args[0] = sb.toString();
+            Object result = joinPoint.proceed(args);
             return result;
         } catch (Throwable t) {
-            return "签名校验异常";
+            return ApiResult.success("签名校验异常");
         }
 
     }

service-issue/service-issue-biz/src/main/java/com/usky/issue/controller/web/YtDeviceStatusController.java

@@ -27,6 +27,12 @@ public class YtDeviceStatusController {
     @Autowired
     private YtDeviceStatusService ytDeviceStatusService;
 
+    @CheckSign
+    @PostMapping("hello")
+    ApiResult<String> hello(@RequestBody String requestBody){
+        return ApiResult.success(requestBody);
+    }
+
     /**
      * 离线设备查询
      * @param requestVO