From 7d9900367d3fa8c8360890f36176eea999e74e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com>
Date: Tue, 14 Sep 2021 10:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?=
 =?UTF-8?q?=20=20=20=20=E9=A6=96=E9=A1=B5=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/templates/login.html           | 4 ++--
 .../com/ruoyi/framework/shiro/service/SysLoginService.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index d993e8b..146a7d2 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -104,14 +104,14 @@
                 <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
                 <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
                 <div class="row m-t" th:if="${captchaEnabled==true}">
-                    <div class="col-xs-6">
+                    <!--<div class="col-xs-6">
                         <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
                     </div>
                     <div class="col-xs-6">
                         <a href="javascript:void(0);" title="点击更换验证码">
                             <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
                         </a>
-                    </div>
+                    </div>-->
                 </div>
                 <div class="checkbox-custom" th:classappend="${captchaEnabled==false} ? 'm-t'">
                     <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
index bd72525..69b1e8d 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
@@ -41,11 +41,11 @@ public class SysLoginService
     public SysUser login(String username, String password)
     {
         // 验证码校验
-        if (ShiroConstants.CAPTCHA_ERROR.equals(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
+        /*if (ShiroConstants.CAPTCHA_ERROR.equals(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
         {
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
             throw new CaptchaException();
-        }
+        }*/
         // 用户名或密码为空 错误
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
         {