WFC/be.wfc
2
0
Fork 0
Code Activity

feat: 邮箱验证码调整

Browse Source
This commit is contained in:
caiyuchao
2025-02-07 19:29:12 +08:00
parent 8e80e320f8
commit 2ef09ec104
13 changed files with 115 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wfc-gateway/src/main/java/org/wfc/gateway/config/properties/CaptchaProperties.java
View File

@@ -15,10 +15,15 @@ import org.springframework.context.annotation.Configuration;
public class CaptchaProperties
{
/**
* 验证码开关
* 图片验证码开关
*/
private Boolean enabled;
/**
* 邮箱验证码开关
*/
private Boolean mailEnabled;
/**
* 验证码类型（math 数组计算 char 字符）
*/
@@ -43,4 +48,12 @@ public class CaptchaProperties
{
this.type = type;
}
public Boolean getMailEnabled() {
return mailEnabled;
}
public void setMailEnabled(Boolean mailEnabled) {
this.mailEnabled = mailEnabled;
}
}

31
wfc-gateway/src/main/java/org/wfc/gateway/filter/ValidateCodeFilter.java
View File

@@ -1,8 +1,7 @@
package org.wfc.gateway.filter;
import java.nio.CharBuffer;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicReference;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilter;
import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
@@ -10,14 +9,16 @@ import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import org.wfc.common.core.utils.ServletUtils;
import org.wfc.common.core.utils.StringUtils;
import org.wfc.gateway.config.properties.CaptchaProperties;
import org.wfc.gateway.service.ValidateCodeService;
import reactor.core.publisher.Flux;
import java.nio.CharBuffer;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicReference;
/**
* 验证码过滤器
*
@@ -26,7 +27,8 @@ import reactor.core.publisher.Flux;
@Component
public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>
{
private final static String[] VALIDATE_URL = new String[] { "/auth/login", "/auth/register" };
private final static String[] VALIDATE_URL = new String[] { "/auth/login" };
private final static String[] MAIL_VALIDATE_URL = new String[] { "/auth/register" };
@Autowired
private ValidateCodeService validateCodeService;
@@ -38,14 +40,18 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>
private static final String UUID = "uuid";
private static final String EMAIL = "email";
@Override
public GatewayFilter apply(Object config)
{
return (exchange, chain) -> {
ServerHttpRequest request = exchange.getRequest();
// 非登录/注册请求或验证码关闭，不处理
if (!StringUtils.equalsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || !captchaProperties.getEnabled())
// 非登录请求且验证码启用，非注册请求且邮箱验证码启用, 不处理
boolean enabledLoginCaptcha = StringUtils.equalsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) && captchaProperties.getEnabled();
boolean enabledRegisterCaptcha = StringUtils.equalsAnyIgnoreCase(request.getURI().getPath(), MAIL_VALIDATE_URL) && captchaProperties.getMailEnabled();
if (!enabledLoginCaptcha && !enabledRegisterCaptcha)
{
return chain.filter(exchange);
}
@@ -54,7 +60,14 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>
{
String rspStr = resolveBodyFromRequest(request);
JSONObject obj = JSON.parseObject(rspStr);
validateCodeService.checkCaptcha(obj.getString(CODE), obj.getString(UUID));
// 图片验证码启用
if (enabledLoginCaptcha) {
validateCodeService.checkCaptcha(obj.getString(CODE), obj.getString(UUID));
}
// 邮箱验证码启用
if (enabledRegisterCaptcha) {
validateCodeService.checkCaptchaEmail(obj.getString(CODE), obj.getString(EMAIL));
}
}
catch (Exception e)
{

8
wfc-gateway/src/main/java/org/wfc/gateway/service/ValidateCodeService.java
View File

@@ -1,9 +1,10 @@
package org.wfc.gateway.service;
import java.io.IOException;
import org.wfc.common.core.exception.CaptchaException;
import org.wfc.common.core.web.domain.AjaxResult;
import java.io.IOException;
/**
* 验证码处理
*
@@ -25,4 +26,9 @@ public interface ValidateCodeService
* 校验验证码
*/
public void checkCaptcha(String key, String value) throws CaptchaException;
/**
* 校验邮箱验证码
*/
public void checkCaptchaEmail(String key, String value) throws CaptchaException;
}

32
wfc-gateway/src/main/java/org/wfc/gateway/service/impl/ValidateCodeServiceImpl.java
View File

@@ -8,13 +8,13 @@ import org.springframework.stereotype.Service;
import org.springframework.util.FastByteArrayOutputStream;
import org.wfc.common.core.constant.CacheConstants;
import org.wfc.common.core.constant.Constants;
import org.wfc.common.core.domain.R;
import org.wfc.common.core.constant.GlobalConstants;
import org.wfc.common.core.exception.CaptchaException;
import org.wfc.common.core.exception.VerificationCodeException;
import org.wfc.common.core.utils.StringUtils;
import org.wfc.common.core.utils.sign.Base64;
import org.wfc.common.core.utils.uuid.IdUtils;
import org.wfc.common.core.web.domain.AjaxResult;
import org.wfc.common.mail.utils.MailUtils;
import org.wfc.common.redis.service.RedisService;
import org.wfc.gateway.config.properties.CaptchaProperties;
import org.wfc.gateway.service.ValidateCodeService;
@@ -66,7 +66,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService
// 保存验证码信息
String uuid = IdUtils.simpleUUID();
String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + uuid;
String capStr = null, code = null;
BufferedImage image = null;
@@ -154,9 +154,9 @@ public class ValidateCodeServiceImpl implements ValidateCodeService
{
if (StringUtils.isEmpty(code))
{
throw new CaptchaException("user.captcha.not.blank");
throw new CaptchaException("user.jcaptcha.not.blank");
}
String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
String captcha = redisService.getCacheObject(verifyKey);
if (captcha == null)
{
@@ -168,4 +168,26 @@ public class ValidateCodeServiceImpl implements ValidateCodeService
throw new CaptchaException();
}
}
/**
* 校验验证码
*/
@Override
public void checkCaptchaEmail(String code, String uuid) throws CaptchaException
{
if (StringUtils.isEmpty(code))
{
throw new VerificationCodeException("email.code.not.blankk");
}
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
String captcha = redisService.getCacheObject(verifyKey);
if (captcha == null)
{
throw new VerificationCodeException();
}
if (!code.equalsIgnoreCase(captcha))
{
throw new VerificationCodeException();
}
}
}