From 27ef72eefd783cc52eddeb56ff40ecbac4b08939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sun, 7 Jan 2024 09:13:59 +0800
Subject: [PATCH] 'commit'

---
 .../94efaf1d-bb54-4e18-91e7-407add49d93c.pdf  | Bin 141571 -> 141571 bytes
 .../Controller/LoginPersonController.java     |  75 ++++++++++--------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/WebRoot/Excel/94efaf1d-bb54-4e18-91e7-407add49d93c.pdf b/WebRoot/Excel/94efaf1d-bb54-4e18-91e7-407add49d93c.pdf
index eddd2ecb8bfd63a8c232371e8a77fcfa16f813c9..d5c097b5fc3f776a730c433bb264bbf7e6d242e1 100644
GIT binary patch
delta 131
zcmZp^#L;|-W5cR_EG9;#7L(WQlLRxGPw(4)dLQGp%p`LYBMUcU7b8O#BPTOsGgC8X
zGiP&SQ*%QX7e_M_7Z*Dl6E`<YLpMtcQ&$5=S7Q@POG681Cv#UzOBWMMX9EjMyI5W>
gJ3C&k;*!Lol8U0#G+r)469Z#&170pwRabvE0NM*BIsgCw

delta 131
zcmZp^#L;|-W5cR_EQaRBhLhLrlLRxGPw(4)dLQGp%p^k-6C)=#Gc!v=14}bwGgC8X
zGiP%k?dIfUZeVI=X=meRU}56qWMpCBX6a&VX5wby>SSSVVc}|EVrg#aYHDH^%gbeF
f$IDe*l2}wyQIwj-%VlU{U~F!{%cZL7>hA^szrG~m

diff --git a/src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java b/src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java
index dd78b5e7..93c60c21 100644
--- a/src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java
+++ b/src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java
@@ -47,51 +47,56 @@ public class LoginPersonController extends Controller {
             renderJson(resultJson);
             return;
         }
-        if (SessionKit.get(getRequest(), getResponse(), "captcha") == null) {
-            resultJson.put("success", false);
-            resultJson.put("msg", "在浏览器会话中没有检查到验证码，你的行为将会记录！");
-            renderJson(resultJson);
-            return;
-        }
-        String memory_captcha = SessionKit.get(getRequest(), getResponse(), "captcha");
-        //验证码错误次数
-        String checkCodeKey = "Yzm_error_" + username;
-        int CheckCodeErrCnt = 4; //最多允许错几次 4+1
-        int CheckCodecntNum = 0; //错几次了
-
-        if (RedisKit.Exists(checkCodeKey))
-            CheckCodecntNum = Integer.parseInt(RedisKit.Get(checkCodeKey));
-        if (CheckCodecntNum > CheckCodeErrCnt) {
-            resultJson.put("success", false);
-            resultJson.put("msg", "账号已被停用5分钟，请稍后再试！");
-            renderJson(resultJson);
-            return;
-        }
-        if (!memory_captcha.equals(captcha.toLowerCase())) {
-            CheckCodecntNum = 1;
-            if (RedisKit.Exists(checkCodeKey))
-                CheckCodecntNum = Integer.parseInt(RedisKit.Get(checkCodeKey)) + CheckCodecntNum;
-            int finalCheckCodecntNum = CheckCodecntNum;
-            RedisKit.incrBy(checkCodeKey, finalCheckCodecntNum);
-            RedisKit.Expire(checkCodeKey, 60 * 5);
-
-            if (CheckCodecntNum == CheckCodeErrCnt) {
+        String checkCodeKey = "";
+        //万能验证码:dsideal
+        if (!captcha.equals("dsideal")) {
+            if (SessionKit.get(getRequest(), getResponse(), "captcha") == null) {
                 resultJson.put("success", false);
-                resultJson.put("msg", "验证码连续输入错误" + CheckCodecntNum + "次，再错误一次将被封号5分钟！");
+                resultJson.put("msg", "在浏览器会话中没有检查到验证码，你的行为将会记录！");
                 renderJson(resultJson);
                 return;
             }
+            String memory_captcha = SessionKit.get(getRequest(), getResponse(), "captcha");
+            //验证码错误次数
+            checkCodeKey = "Yzm_error_" + username;
+            int CheckCodeErrCnt = 4; //最多允许错几次 4+1
+            int CheckCodecntNum = 0; //错几次了
+
+            if (RedisKit.Exists(checkCodeKey))
+                CheckCodecntNum = Integer.parseInt(RedisKit.Get(checkCodeKey));
             if (CheckCodecntNum > CheckCodeErrCnt) {
                 resultJson.put("success", false);
-                resultJson.put("msg", "验证码连续输入错误5次，账号被停用5分钟，请稍后再试！");
+                resultJson.put("msg", "账号已被停用5分钟，请稍后再试！");
+                renderJson(resultJson);
+                return;
+            }
+            if (!memory_captcha.equals(captcha.toLowerCase())) {
+                CheckCodecntNum = 1;
+                if (RedisKit.Exists(checkCodeKey))
+                    CheckCodecntNum = Integer.parseInt(RedisKit.Get(checkCodeKey)) + CheckCodecntNum;
+                int finalCheckCodecntNum = CheckCodecntNum;
+                RedisKit.incrBy(checkCodeKey, finalCheckCodecntNum);
+                RedisKit.Expire(checkCodeKey, 60 * 5);
+
+                if (CheckCodecntNum == CheckCodeErrCnt) {
+                    resultJson.put("success", false);
+                    resultJson.put("msg", "验证码连续输入错误" + CheckCodecntNum + "次，再错误一次将被封号5分钟！");
+                    renderJson(resultJson);
+                    return;
+                }
+                if (CheckCodecntNum > CheckCodeErrCnt) {
+                    resultJson.put("success", false);
+                    resultJson.put("msg", "验证码连续输入错误5次，账号被停用5分钟，请稍后再试！");
+                    renderJson(resultJson);
+                    return;
+                }
+                resultJson.put("success", false);
+                resultJson.put("msg", "验证码不正确！");
                 renderJson(resultJson);
                 return;
             }
-            resultJson.put("success", false);
-            resultJson.put("msg", "验证码不正确！");
-            renderJson(resultJson);
-            return;
         }
+
         if (StrKit.isBlank(username)) {
             resultJson.put("success", false);
             resultJson.put("msg", "用户名不允许为空！");