修改bug

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java

@@ -84,7 +84,7 @@ public class LoginController extends BaseController {
      * @return
      */
     @RequestMapping(value = "ajaxLogin", method = RequestMethod.POST)
-    public ResponseEntity<Map<String, Object>> ajaxLogin(@RequestParam(value = "username", required = true) String username,
+    public Map<String, Object> ajaxLogin(@RequestParam(value = "username", required = true) String username,
                                          @RequestParam(value = "password", required = true) String password,
 //                                                         @RequestParam(value = "captcha", required = true) String captcha,
                                          HttpServletRequest request) {
@@ -134,22 +134,22 @@ public class LoginController extends BaseController {
 
                 user = userService.selectByUsername(username);
                 if (user == null) {
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "用户名不正确！");
-                    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                    return resultMap;
                 }
 
                 if (AuditOperationEnum.DISABLE.name().equals(user.getStatus())) {
                     resultMap.put("resultCode", "500");
                     resultMap.put("message", "此帐号已禁用，请联系管理员！");
-                    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                    return resultMap;
                 }
 
                 if (user.getPermanent() != null && !user.getPermanent()) {
                     if (user.getEffectiveDate().isAfter(LocalDate.now()) || user.getExiredDate().isBefore(LocalDate.now())) {
                         resultMap.put("resultCode", "500");
                         resultMap.put("message", "此帐号已失效，请联系管理员！");
-                        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                        return resultMap;
                     }
                 }
 
@@ -168,16 +168,16 @@ public class LoginController extends BaseController {
 //                            stringRedisTemplate.expire(SHIRO_IS_LOCK + username, 12, TimeUnit.HOURS);
 //                        }
 //                    }
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "密码不正确！");
 //                    resultMap.put("message", "密码不正确,您还有" + (i - Integer.parseInt(s)) + "次机会！");
-                    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                    return resultMap;
                 }
                 List<Role> roles = roleService.selectRoleByUserId(user.getId());
                 List<String> list1 = new ArrayList<>();
                 //获取当前用户角色拥有菜单
                 List<Menu> userMenuPerms = new ArrayList<>();
-                if (roles != null &&roles.size()>0 &&roles.get(0) != null) {
+                if (roles != null && roles.size() > 0 && roles.get(0) != null) {
                     roles.forEach(r -> list1.add(r.getId()));
                     user.setRoleList(list1);
                     userMenuPerms = this.menuService.getUserMenuPerms(list1);
@@ -198,17 +198,17 @@ public class LoginController extends BaseController {
                 resultMap.put("menuList", userMenuPerms);
                 resultMap.put("resultCode", "200");
                 resultMap.put("message", "登录成功");
-                return ResponseEntity.ok(resultMap);
+                return resultMap;
             } catch (Exception e) {
                 resultMap.put("resultCode", "500");
-                resultMap.put("message", e.getMessage());
+                resultMap.put("message", "登录失败");
             }
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+        return getFailResult("登录失败");
     }
 
     @RequestMapping(value = "logout", method = RequestMethod.GET)
-    public ResponseEntity<JSONObject> logout() {
+    public Map<String, Object> logout() {
         String token = request.getHeader("Authorization");
         try {
             if (StringUtils.isNotBlank(token)) {
@@ -219,11 +219,11 @@ public class LoginController extends BaseController {
             resultMap.put("resultCode", "200");
             resultMap.put("message", "成功");
             resultMap.put("data", "");
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
-            LOGGER.error("注销错误！", e);
+            LOGGER.error("注销错误", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        return getFailResult("注销错误");
     }
 
     @RequestMapping(value = {"/verifyCode"}, method = {RequestMethod.GET})