From 5de0f3ed50b109ffbf6481fe89c428aa734a085d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E7=A0=81-=E6=96=B9=E6=99=93=E8=BE=89?= Date: Tue, 3 Feb 2026 19:01:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9F=AD=E4=BF=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=A0=A1=E9=AA=8C=E5=9B=BE=E5=BD=A2=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 发送短信时已经验证过图形验证码，登录时无需再次验证。 避免用户输入两次图形验证码，提升体验。 --- .../java/org/dromara/pangu/h5/domain/dto/H5SmsLoginDto.java | 6 ++---- .../dromara/pangu/h5/service/impl/H5AuthServiceImpl.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/domain/dto/H5SmsLoginDto.java b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/domain/dto/H5SmsLoginDto.java index 45fed13..22549ab 100644 --- a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/domain/dto/H5SmsLoginDto.java +++ b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/domain/dto/H5SmsLoginDto.java @@ -23,11 +23,9 @@ public class H5SmsLoginDto { @NotBlank(message = "短信验证码不能为空") private String smsCode; - @Schema(description = "图形验证码答案", requiredMode = Schema.RequiredMode.REQUIRED, example = "5") - @NotBlank(message = "图形验证码不能为空") + @Schema(description = "图形验证码答案（短信登录时可不传，发送短信时已验证）", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "5") private String captchaCode; - @Schema(description = "图形验证码标识（从/captcha接口获取）", requiredMode = Schema.RequiredMode.REQUIRED, example = "abc123def456") - @NotBlank(message = "验证码标识不能为空") + @Schema(description = "图形验证码标识（短信登录时可不传）", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "abc123def456") private String uuid; } diff --git a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/service/impl/H5AuthServiceImpl.java b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/service/impl/H5AuthServiceImpl.java index 487134a..287895c 100644 --- a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/service/impl/H5AuthServiceImpl.java +++ b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/service/impl/H5AuthServiceImpl.java @@ -272,10 +272,8 @@ public class H5AuthServiceImpl implements H5AuthService { @Override public H5LoginVo loginBySms(H5SmsLoginDto dto) { - // 校验图形验证码 - validateCaptcha(dto.getUuid(), dto.getCaptchaCode()); - - // 校验短信验证码 + // 短信登录不再校验图形验证码（发送短信时已校验过，避免用户输入两次） + // 只校验短信验证码 validateSmsCode(dto.getPhone(), dto.getSmsCode(), "login"); // 查询会员