public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-04-07 19:13:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 修复手机号和邮箱格式校验

Browse Source
This commit is contained in:
AprilWind
2026-03-25 20:47:15 +08:00
parent d177eef25e
commit e00837a26f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java
View File

@@ -21,8 +21,8 @@ import org.dromara.common.mail.utils.MailUtils;
import org.dromara.common.redis.annotation.RateLimiter; import org.dromara.common.redis.annotation.RateLimiter;
import org.dromara.common.redis.enums.LimitType; import org.dromara.common.redis.enums.LimitType;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.web.core.WaveAndCircleCaptcha;
import org.dromara.common.web.config.properties.CaptchaProperties; import org.dromara.common.web.config.properties.CaptchaProperties;
import org.dromara.common.web.core.WaveAndCircleCaptcha;
import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.core.factory.SmsFactory; import org.dromara.sms4j.core.factory.SmsFactory;
@@ -61,7 +61,7 @@ public class CaptchaController {
@RateLimiter(key = "#phonenumber", time = 60, count = 1) @RateLimiter(key = "#phonenumber", time = 60, count = 1)
@GetMapping("/resource/sms/code") @GetMapping("/resource/sms/code")
public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phoneNumber) { public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phoneNumber) {
if (RegexValidator.isMobile(phoneNumber)) { if (!RegexValidator.isMobile(phoneNumber)) {
return R.fail("请输入正确的手机号！"); return R.fail("请输入正确的手机号！");
} }
String key = GlobalConstants.CAPTCHA_CODE_KEY + phoneNumber; String key = GlobalConstants.CAPTCHA_CODE_KEY + phoneNumber;
@@ -91,7 +91,7 @@ public class CaptchaController {
if (!mailProperties.getEnabled()) { if (!mailProperties.getEnabled()) {
return R.fail("当前系统没有开启邮箱功能！"); return R.fail("当前系统没有开启邮箱功能！");
} }
if (RegexValidator.isEmail(email)) { if (!RegexValidator.isEmail(email)) {
return R.fail("请输入正确的邮箱地址！"); return R.fail("请输入正确的邮箱地址！");
} }
SpringUtils.getAopProxy(this).emailCodeImpl(email); SpringUtils.getAopProxy(this).emailCodeImpl(email);
@@ -168,8 +168,8 @@ public class CaptchaController {
* 图片验证码响应对象。 * 图片验证码响应对象。
* *
* @param captchaEnabled 是否启用验证码 * @param captchaEnabled 是否启用验证码
* @param uuid 验证码标识 * @param uuid 验证码标识
* @param img Base64 图片数据 * @param img Base64 图片数据
*/ */
public record CaptchaVo(Boolean captchaEnabled, String uuid, String img) { public record CaptchaVo(Boolean captchaEnabled, String uuid, String img) {
} }