1.模糊登录信息提示，修改以sessionId作为验证码的出现基准

王通
1 parent 56ccdff4
Showing 1 changed file with 17 additions and 12 deletions
src/main/java/com/bsth/controller/sys/UserController.java
@@ -57,6 +57,15 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
     //需要验证码的账号
     public static Map<String, Integer> captchaMap = new HashMap<>();
+    private static void captcha(String sessionId) {
+        Integer captchSize = captchaMap.get(sessionId);
+        if (null == captchSize)
+            captchSize = 0;
+
+        captchSize++;
+        captchaMap.put(sessionId, captchSize);
+    }
+
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
                                      @RequestParam String password, String captcha) {
@@ -88,8 +97,10 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             }
             SysUser user = sysUserService.findByUserName(userName);
-            if (null == user)
-                return put(rs, "msg", "不存在的用户");
+            if (null == user) {
+                captcha(session.getId());
+                return put(rs, "msg", "用户名或密码错误");
+            }
             if (!user.isEnabled())
                 return put(rs, "msg", "该用户已被锁定，请联系管理员");
@@ -97,14 +108,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             // 校验密码
             boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
             if (!matchStatus) {
-                rs.put("msg", "密码有误");
-
-                Integer captchSize = captchaMap.get(userName);
-                if (null == captchSize)
-                    captchSize = 0;
-
-                captchSize++;
-                captchaMap.put(userName, captchSize);
+                captcha(session.getId());
+                rs.put("msg", "用户名或密码错误");
                 return rs;
             }
@@ -226,8 +231,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
     }
     @RequestMapping(value = "/login/captchaStatus")
-    public int captchaStatus(String userName) {
-        Integer size = captchaMap.get(userName);
+    public int captchaStatus(String userName, HttpServletRequest request) {
+        Integer size = captchaMap.get(request.getSession().getId());
         return size == null ? 0 : size;
     }