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"); // 查询会员