Merge branch 'develop' of http://58.210.154.140:8888/iidi/backend/bocloud.sms into develop

bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/LoginController.java

@@ -63,6 +63,7 @@ public class LoginController {
     @PostMapping("/users/login")
     public GeneralResult<Map<String, Object>> userLogin(@RequestBody LoginModel loginModel,
                                                         HttpServletRequest request) {
+        try {
             log.info("开始执行登录请求");
             long start;
             String account = loginModel.getAccount();
@@ -122,6 +123,10 @@ public class LoginController {
             log.info("删除Redis耗时{}ms", System.currentTimeMillis() - start);
             log.info("登录请求处理完成");
             return loginResult;
+        }catch (Exception e){
+            log.error("登录异常",e);
+            return new GeneralResult<>(false,"登录异常:" + e.getMessage());
+        }
     }
 
     /**