From 813eec5e7f11010601715a2512b503b441523727 Mon Sep 17 00:00:00 2001 From: xiang Date: Sat, 6 Sep 2025 09:16:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=A1=E9=AA=8C=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xservice/auth/api/dto/req/CaptchaImageRequest.java | 3 +++ .../auth/server/controller/ValidationCodeController.java | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/CaptchaImageRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/CaptchaImageRequest.java index 1240a0a..813edb9 100644 --- a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/CaptchaImageRequest.java +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/CaptchaImageRequest.java @@ -4,11 +4,14 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @Data @AllArgsConstructor @NoArgsConstructor public class CaptchaImageRequest { + @NotBlank(message = "用户名不能为空") private String username; private Integer number; diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/ValidationCodeController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/ValidationCodeController.java index 1284ad5..421efaf 100644 --- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/ValidationCodeController.java +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/ValidationCodeController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import java.util.Objects; @Slf4j @RestController @@ -25,9 +26,11 @@ public class ValidationCodeController { @PostMapping("/public/captchaImage") public Result getCaptchaImage(@RequestBody @NotNull(message = "请求参数不能为空") @Valid CaptchaImageRequest request) { + if (Objects.isNull(request.getNumber())) { + request.setNumber(4); + } try { String randomCode = RandomCodeUtils.getNumberRandomCode(1); -// String randomCode = "1"; CaptchaDTO captchaImage; if (StringUtils.isBlank(randomCode)) { captchaImage = validCodeGenerateFactory.get(CaptchaTypeEnum.NORMAL_CAPTCHA_IMAGE.getType()).getCaptchaImage(request); @@ -49,6 +52,10 @@ public class ValidationCodeController { @PostMapping("/public/getSmsCode") public Result getSmsCode(@RequestBody @NotNull(message = "请求参数不能为空") @Valid CaptchaImageRequest request) { + if (Objects.isNull(request.getNumber())) { + request.setNumber(4); + } + try { validCodeGenerateFactory.get(CaptchaTypeEnum.NUMBER_CAPTCHA_CODE.getType()).getCaptchaImage(request); return Result.success();