refactor: 优化图形验证码使用及部分配置
This commit is contained in:
parent
c9cda12b7d
commit
a50d857c41
@ -47,6 +47,7 @@ import top.charles7c.continew.admin.common.config.properties.CaptchaProperties;
|
|||||||
import top.charles7c.continew.admin.common.constant.CacheConstants;
|
import top.charles7c.continew.admin.common.constant.CacheConstants;
|
||||||
import top.charles7c.continew.admin.common.model.resp.CaptchaResp;
|
import top.charles7c.continew.admin.common.model.resp.CaptchaResp;
|
||||||
import top.charles7c.continew.starter.cache.redisson.util.RedisUtils;
|
import top.charles7c.continew.starter.cache.redisson.util.RedisUtils;
|
||||||
|
import top.charles7c.continew.starter.captcha.graphic.core.GraphicCaptchaService;
|
||||||
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
|
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
|
||||||
import top.charles7c.continew.starter.core.util.TemplateUtils;
|
import top.charles7c.continew.starter.core.util.TemplateUtils;
|
||||||
import top.charles7c.continew.starter.core.util.validate.CheckUtils;
|
import top.charles7c.continew.starter.core.util.validate.CheckUtils;
|
||||||
@ -74,7 +75,7 @@ import java.util.Map;
|
|||||||
public class CaptchaController {
|
public class CaptchaController {
|
||||||
|
|
||||||
private final CaptchaService behaviorCaptchaService;
|
private final CaptchaService behaviorCaptchaService;
|
||||||
private final Captcha graphicCaptchaService;
|
private final GraphicCaptchaService graphicCaptchaService;
|
||||||
private final ProjectProperties projectProperties;
|
private final ProjectProperties projectProperties;
|
||||||
private final CaptchaProperties captchaProperties;
|
private final CaptchaProperties captchaProperties;
|
||||||
|
|
||||||
@ -99,9 +100,9 @@ public class CaptchaController {
|
|||||||
public R<CaptchaResp> getImageCaptcha() {
|
public R<CaptchaResp> getImageCaptcha() {
|
||||||
String uuid = IdUtil.fastUUID();
|
String uuid = IdUtil.fastUUID();
|
||||||
String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + uuid;
|
String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + uuid;
|
||||||
RedisUtils.set(captchaKey, graphicCaptchaService.text(), Duration.ofMinutes(captchaProperties
|
Captcha captcha = graphicCaptchaService.getCaptcha();
|
||||||
.getExpirationInMinutes()));
|
RedisUtils.set(captchaKey, captcha.text(), Duration.ofMinutes(captchaProperties.getExpirationInMinutes()));
|
||||||
return R.ok(CaptchaResp.builder().uuid(uuid).img(graphicCaptchaService.toBase64()).build());
|
return R.ok(CaptchaResp.builder().uuid(uuid).img(captcha.toBase64()).build());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "获取邮箱验证码", description = "发送验证码到指定邮箱")
|
@Operation(summary = "获取邮箱验证码", description = "发送验证码到指定邮箱")
|
||||||
|
@ -115,7 +115,6 @@ continew-starter.captcha:
|
|||||||
water-mark: ${project.app-name}
|
water-mark: ${project.app-name}
|
||||||
## 图形验证码
|
## 图形验证码
|
||||||
graphic:
|
graphic:
|
||||||
enabled: true
|
|
||||||
# 类型
|
# 类型
|
||||||
type: SPEC
|
type: SPEC
|
||||||
# 内容长度
|
# 内容长度
|
||||||
|
@ -117,7 +117,6 @@ continew-starter.captcha:
|
|||||||
water-mark: ${project.app-name}
|
water-mark: ${project.app-name}
|
||||||
## 图形验证码
|
## 图形验证码
|
||||||
graphic:
|
graphic:
|
||||||
enabled: true
|
|
||||||
# 类型
|
# 类型
|
||||||
type: SPEC
|
type: SPEC
|
||||||
# 内容长度
|
# 内容长度
|
||||||
|
@ -22,7 +22,6 @@ project:
|
|||||||
|
|
||||||
--- ### 日志配置
|
--- ### 日志配置
|
||||||
continew-starter.log:
|
continew-starter.log:
|
||||||
enabled: true
|
|
||||||
# 包含信息
|
# 包含信息
|
||||||
include:
|
include:
|
||||||
- DESCRIPTION
|
- DESCRIPTION
|
||||||
|
Loading…
Reference in New Issue
Block a user