update:SM2非对称加密的优化

main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java

@@ -69,11 +69,6 @@ public class LoginController {
     @PostMapping("/smsVerification")
     @Operation(summary = "短信验证码")
     public Result<Void> smsVerification(@RequestBody SmsVerificationDTO dto) {
-        // 验证图形验证码
-        boolean validate = captchaService.validate(dto.getCaptchaId(), dto.getCaptcha(), true);
-        if (!validate) {
-            throw new RenException(ErrorCode.SMS_CAPTCHA_ERROR);
-        }
         Boolean isMobileRegister = sysParamsService
                 .getValueObject(Constant.SysMSMParam.SERVER_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class);
         if (!isMobileRegister) {
@@ -182,13 +177,18 @@ public class LoginController {
         // 是否开启手机注册
         Boolean isMobileRegister = sysParamsService
                 .getValueObject(Constant.SysMSMParam.SERVER_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class);
-        
+        boolean validate;
         if (isMobileRegister) {
             // 验证用户是否是手机号码
             boolean validPhone = ValidatorUtils.isValidPhone(login.getUsername());
             if (!validPhone) {
                 throw new RenException(ErrorCode.USERNAME_NOT_PHONE);
             }
+            // 验证短信验证码是否正常
+            validate = captchaService.validateSMSValidateCode(login.getUsername(), login.getMobileCaptcha(), false);
+            if (!validate) {
+                throw new RenException(ErrorCode.SMS_CODE_ERROR);
+            }
         }
 
         // 按照用户名获取用户

main/manager-api/src/main/java/xiaozhi/modules/security/dto/LoginDTO.java

@@ -21,10 +21,6 @@ public class LoginDTO implements Serializable {
     @NotBlank(message = "{sysuser.password.require}")
     private String password;
 
-    @Schema(description = "验证码")
-    @NotBlank(message = "{sysuser.captcha.require}")
-    private String captcha;
-
     @Schema(description = "手机验证码")
     private String mobileCaptcha;