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

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();
}
}
}