From 9c6513265051b5518dc8cb0581597e6c457ca08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com>
Date: Fri, 5 Dec 2025 22:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E6=96=B0=E5=A2=9Eflag=EF=BC=8C=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=98=AF=E5=90=A6=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysLoginController.java    |  2 +-
 .../zhyc/common/core/domain/model/LoginBody.java | 12 ++++++++++++
 .../framework/web/service/SysLoginService.java   | 16 +++++++++-------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/zhyc-admin/src/main/java/com/zhyc/web/controller/system/SysLoginController.java b/zhyc-admin/src/main/java/com/zhyc/web/controller/system/SysLoginController.java
index f3b318a..edfc953 100644
--- a/zhyc-admin/src/main/java/com/zhyc/web/controller/system/SysLoginController.java
+++ b/zhyc-admin/src/main/java/com/zhyc/web/controller/system/SysLoginController.java
@@ -51,7 +51,7 @@ public class SysLoginController
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
+                loginBody.getUuid(),loginBody.getFlag());
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }
diff --git a/zhyc-common/src/main/java/com/zhyc/common/core/domain/model/LoginBody.java b/zhyc-common/src/main/java/com/zhyc/common/core/domain/model/LoginBody.java
index fda8f5b..7de3fc6 100644
--- a/zhyc-common/src/main/java/com/zhyc/common/core/domain/model/LoginBody.java
+++ b/zhyc-common/src/main/java/com/zhyc/common/core/domain/model/LoginBody.java
@@ -26,6 +26,10 @@ public class LoginBody
      * 唯一标识
      */
     private String uuid;
+    /**
+     * 登录参数
+     */
+    private boolean flag;
 
     public String getUsername()
     {
@@ -66,4 +70,12 @@ public class LoginBody
     {
         this.uuid = uuid;
     }
+
+    public boolean getFlag() {
+        return flag;
+    }
+
+    public void setFlag(boolean flag) {
+        this.flag = flag;
+    }
 }
diff --git a/zhyc-framework/src/main/java/com/zhyc/framework/web/service/SysLoginService.java b/zhyc-framework/src/main/java/com/zhyc/framework/web/service/SysLoginService.java
index 854517f..581b332 100644
--- a/zhyc-framework/src/main/java/com/zhyc/framework/web/service/SysLoginService.java
+++ b/zhyc-framework/src/main/java/com/zhyc/framework/web/service/SysLoginService.java
@@ -54,17 +54,18 @@ public class SysLoginService
 
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param password 密码
-     * @param code 验证码
-     * @param uuid 唯一标识
+     * @param code     验证码
+     * @param uuid     唯一标识
+     * @param flag 是否开启验证
      * @return 结果
      */
-    public String login(String username, String password, String code, String uuid)
+    public String login(String username, String password, String code, String uuid, boolean flag)
     {
         // 验证码校验
-        validateCaptcha(username, code, uuid);
+        validateCaptcha(username, code, uuid,flag);
         // 登录前置校验
         loginPreCheck(username, password);
         // 用户验证
@@ -106,12 +107,13 @@ public class SysLoginService
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识
+     * @param flag 是否进行验证码校验
      * @return 结果
      */
-    public void validateCaptcha(String username, String code, String uuid)
+    public void validateCaptcha(String username, String code, String uuid,boolean flag)
     {
         boolean captchaEnabled = configService.selectCaptchaEnabled();
-        if (captchaEnabled)
+        if (captchaEnabled && !flag)
         {
             String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
             String captcha = redisCache.getCacheObject(verifyKey);