Merge branch 'feature-20200720' into 'dev'

Feature 20200720

See merge request !32

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

@@ -57,10 +57,11 @@ public class BindInfoControlller extends BaseController {
         } catch ( DistributedLockException e ) {
             log.error("分布式锁超时");
             return ResultGenerator.fail(StatusCode.REPEAT_SUBMIT);
-        } catch ( Exception e ) {
-            log.error("系统异常：{}", e);
-            return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
         }
+//        catch ( Exception e ) {
+//            log.error("系统异常：{}", e);
+//            return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
+//        }
         return response;
     }
 
@@ -73,7 +74,13 @@ public class BindInfoControlller extends BaseController {
     @BodyDecryptAnnotation
     @ResponseEncryptAnnotation
     public Result<BindInfoRes> bindSmsValid(@RequestBody @Validated BindSmsValidReq req) {
-        return service.bindSmsValid(req);
+        Result result = null;
+        try {
+            result = service.bindSmsValid(req);
+        } catch ( DistributedLockException e ) {
+            return ResultGenerator.fail(StatusCode.REPEAT_SUBMIT);
+        }
+        return result;
     }
 
 
@@ -94,9 +101,6 @@ public class BindInfoControlller extends BaseController {
              result = service.unbindInfo(req);
         } catch ( DistributedLockException e ) {
             return ResultGenerator.fail(StatusCode.REPEAT_SUBMIT);
-        } catch ( Exception e ) {
-            log.error("系统异常：{}", e);
-            return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
         }
         return result;
     }
@@ -115,9 +119,6 @@ public class BindInfoControlller extends BaseController {
             result = service.adminUnbind(req);
         } catch ( DistributedLockException e ) {
             return ResultGenerator.fail(StatusCode.REPEAT_SUBMIT);
-        } catch ( Exception e ) {
-            log.error("系统异常：{}", e);
-            return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
         }
         return result;
     }
@@ -136,9 +137,6 @@ public class BindInfoControlller extends BaseController {
             result = service.adminUnbindSmsValid(req);
         } catch ( DistributedLockException e ) {
             return ResultGenerator.fail(StatusCode.REPEAT_SUBMIT);
-        } catch ( Exception e ) {
-            log.error("系统异常：{}", e);
-            return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
         }
         return result;
     }

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

@@ -120,7 +120,7 @@ public class H5Controller {
     }
 
     /**
-     * 验证当前手机号是否在1天内,已通过验证
+     * 【驾照信息查询】验证当前手机号是否在1天内,已通过验证
      *
      * @param query
      * @return
@@ -143,7 +143,7 @@ public class H5Controller {
     }
 
     /***
-     * 发送短信验证码
+     * 【驾照信息查询】发送短信验证码
      *
      * @param req
      * @return Result
@@ -161,7 +161,7 @@ public class H5Controller {
     }
 
     /**
-     * 校验短信验证码
+     * 【驾照信息查询】校验短信验证码
      *
      * @param req
      * @return Result

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/exception/GlobalExceptionHandler.java

@@ -90,7 +90,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler({BusinessException.class})
     @ResponseBody
     public Response<Object> handle(BusinessException e) {
-        log.warn(e.toString(), e);
+        log.error(e.toString(), e);
         return ResponseGenerator.fail(e.getCode(), e.getMsg(), e.getErrorMsg(), e.getParam());
     }