From 93cddd74f8c54596ff9d08a53cfcda09cb8c8aa9 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 21 Oct 2025 10:03:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/module/system/login/domain/LoginForm.java | 3 +++ .../module/system/login/service/LoginService.java | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java index fd707a1..80af815 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java @@ -37,4 +37,7 @@ public class LoginForm extends CaptchaForm { @Schema(description = "邮箱验证码") private String emailCode; + + @Schema(description = "免登录标识") + private Integer ssoLogin; } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index 1534128..16fef18 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java @@ -240,11 +240,13 @@ public class LoginService implements StpInterface { return ResponseDTO.userErrorParam("登录设备暂不支持!"); } - if (loginForm.getLoginDevice() == LoginDeviceEnum.PC.getValue()) { - // 校验 图形验证码 - ResponseDTO checkCaptcha = captchaService.checkCaptcha(loginForm); - if (!checkCaptcha.getOk()) { - return ResponseDTO.error(UserErrorCode.PARAM_ERROR, checkCaptcha.getMsg()); + if (loginForm.getSsoLogin() == null || loginForm.getSsoLogin() == 0) { + if (loginForm.getLoginDevice() == LoginDeviceEnum.PC.getValue()) { + // 校验 图形验证码 + ResponseDTO checkCaptcha = captchaService.checkCaptcha(loginForm); + if (!checkCaptcha.getOk()) { + return ResponseDTO.error(UserErrorCode.PARAM_ERROR, checkCaptcha.getMsg()); + } } } UserTypeEnum userTypeEnum = loginDeviceEnum.getValue() == 1 ? UserTypeEnum.ADMIN_EMPLOYEE : UserTypeEnum.NORMAL_EMPLOYEE;