From a50d857c41d164355d36ae5dfd14c6badbe06202 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 4 Feb 2024 23:36:43 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=9B=BE?=
 =?UTF-8?q?=E5=BD=A2=E9=AA=8C=E8=AF=81=E7=A0=81=E4=BD=BF=E7=94=A8=E5=8F=8A?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../continew/admin/webapi/common/CaptchaController.java  | 9 +++++----
 .../src/main/resources/config/application-dev.yml        | 1 -
 .../src/main/resources/config/application-prod.yml       | 1 -
 .../src/main/resources/config/application.yml            | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java
index bd0e9210..5f54d7b0 100644
--- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java
+++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java
@@ -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.model.resp.CaptchaResp;
 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.util.TemplateUtils;
 import top.charles7c.continew.starter.core.util.validate.CheckUtils;
@@ -74,7 +75,7 @@ import java.util.Map;
 public class CaptchaController {
 
     private final CaptchaService behaviorCaptchaService;
-    private final Captcha graphicCaptchaService;
+    private final GraphicCaptchaService graphicCaptchaService;
     private final ProjectProperties projectProperties;
     private final CaptchaProperties captchaProperties;
 
@@ -99,9 +100,9 @@ public class CaptchaController {
     public R<CaptchaResp> getImageCaptcha() {
         String uuid = IdUtil.fastUUID();
         String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + uuid;
-        RedisUtils.set(captchaKey, graphicCaptchaService.text(), Duration.ofMinutes(captchaProperties
-            .getExpirationInMinutes()));
-        return R.ok(CaptchaResp.builder().uuid(uuid).img(graphicCaptchaService.toBase64()).build());
+        Captcha captcha = graphicCaptchaService.getCaptcha();
+        RedisUtils.set(captchaKey, captcha.text(), Duration.ofMinutes(captchaProperties.getExpirationInMinutes()));
+        return R.ok(CaptchaResp.builder().uuid(uuid).img(captcha.toBase64()).build());
     }
 
     @Operation(summary = "获取邮箱验证码", description = "发送验证码到指定邮箱")
diff --git a/continew-admin-webapi/src/main/resources/config/application-dev.yml b/continew-admin-webapi/src/main/resources/config/application-dev.yml
index 820c056e..cee37c3f 100644
--- a/continew-admin-webapi/src/main/resources/config/application-dev.yml
+++ b/continew-admin-webapi/src/main/resources/config/application-dev.yml
@@ -115,7 +115,6 @@ continew-starter.captcha:
     water-mark: ${project.app-name}
   ## 图形验证码
   graphic:
-    enabled: true
     # 类型
     type: SPEC
     # 内容长度
diff --git a/continew-admin-webapi/src/main/resources/config/application-prod.yml b/continew-admin-webapi/src/main/resources/config/application-prod.yml
index 59989037..dd86a414 100644
--- a/continew-admin-webapi/src/main/resources/config/application-prod.yml
+++ b/continew-admin-webapi/src/main/resources/config/application-prod.yml
@@ -117,7 +117,6 @@ continew-starter.captcha:
     water-mark: ${project.app-name}
   ## 图形验证码
   graphic:
-    enabled: true
     # 类型
     type: SPEC
     # 内容长度
diff --git a/continew-admin-webapi/src/main/resources/config/application.yml b/continew-admin-webapi/src/main/resources/config/application.yml
index ce984e3f..86885702 100644
--- a/continew-admin-webapi/src/main/resources/config/application.yml
+++ b/continew-admin-webapi/src/main/resources/config/application.yml
@@ -22,7 +22,6 @@ project:
 
 --- ### 日志配置
 continew-starter.log:
-  enabled: true
   # 包含信息
   include:
     - DESCRIPTION