Merge remote-tracking branch 'origin/dev' into dev

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/H5Controller.java

@@ -146,7 +146,7 @@ public class H5Controller {
      * 发送短信验证码
      *
      * @param req
-     * @return Response
+     * @return Result
      * @author: xsx
      * @date: 2020/6/21 13:57
      */
@@ -164,7 +164,7 @@ public class H5Controller {
      * 校验短信验证码
      *
      * @param req
-     * @return Response
+     * @return Result
      * @author: xsx
      * @date: 2020/6/21 13:58
      */

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/intercept/EncryptResponseBodyAdvice.java

@@ -41,7 +41,7 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice {
     @Override
     public Object beforeBodyWrite( Object o, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse ) {
         try {
-            log.info("Response body 明文: {}", objectMapper.writeValueAsString(o));
+            log.info("Result body 明文: {}", objectMapper.writeValueAsString(o));
             if ( methodParameter.getMethod().isAnnotationPresent(ResponseEncryptAnnotation.class) && o instanceof Response ) {
                 Response<Object> result = (Response<Object>) o;
                 if ( StatusCode.SUCCESS.getCode() == (result.getCode()) ) {
@@ -54,12 +54,12 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice {
                         baseEncryptRes.setEncData(encryptStr);
                         result.setData(baseEncryptRes);
                         o = result;
-                        log.info("Response body 密文: {}", objectMapper.writeValueAsString(o));
+                        log.info("Result body 密文: {}", objectMapper.writeValueAsString(o));
                     }
                 }
             }
         } catch ( Exception e ) {
-            log.error("Response body 加密异常：{}", e);
+            log.error("Result body 加密异常：{}", e);
         }
         return o;
     }

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/Result/ResultGenerator.java

@@ -33,7 +33,7 @@ public class ResultGenerator {
     public static <T> Result<T> fail(String msg) {
         Result<T> result = new Result<>();
         result.setSuccess(false);
-        result.setCode(StatusCode.BUSINESS_ERROR.getCode());
+        result.setCode(ResultCode.BUSINESS_ERROR.getCode());
         result.setMsg(msg);
         return result;
     }