From 82b0e63166c9ce04cbeef556a4e062377e4b4a1e Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Sun, 8 Apr 2018 16:14:02 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/shiro/MyShiroRealm.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java b/boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java
index d717ec8..087ed75 100644
--- a/boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java
+++ b/boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java
@@ -8,6 +8,8 @@ import com.xwbing.service.sys.SysAuthorityService;
 import com.xwbing.service.sys.SysRoleService;
 import com.xwbing.service.sys.SysUserService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -90,11 +92,11 @@ public class MyShiroRealm extends AuthorizingRealm {
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) {
         UsernamePasswordCaptchaToken captchaToken = (UsernamePasswordCaptchaToken) authenticationToken;
         //1.校验验证码
-//        String captcha = captchaToken.getCaptcha();
-//        String imgCode = (String) SecurityUtils.getSubject().getSession().getAttribute(CommonConstant.KEY_CAPTCHA);
-//        if (StringUtils.isEmpty(captcha) || !captcha.equalsIgnoreCase(imgCode)) {
-//            throw new AuthenticationException("验证码错误");
-//        }
+        String captcha = captchaToken.getCaptcha();
+        String imgCode = (String) SecurityUtils.getSubject().getSession().getAttribute(CommonConstant.KEY_CAPTCHA);
+        if (StringUtils.isEmpty(captcha) || !captcha.equalsIgnoreCase(imgCode)) {
+            throw new AuthenticationException("验证码错误");
+        }
         //2.查是否有此用户
         SysUser user = sysUserService.getByUserName(captchaToken.getUsername());
         if (user == null) {