From d1b1966f2581768d64536319b0ad42fd6694b607 Mon Sep 17 00:00:00 2001 From: ZouLiFu Date: Thu, 21 Jan 2021 17:41:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=20=E7=B1=BB=E5=9E=8B=E4=B8=BA=E7=82=B9?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _web/src/views/userLoginReg/Login.vue | 2 +- .../main/java/com/cn/xiaonuo/core/consts/CommonConstant.java | 4 ++-- .../xiaonuo/core/context/constant/ConstantContextHolder.java | 1 - .../sys/modular/auth/controller/SysLoginController.java | 2 ++ .../cn/xiaonuo/sys/provider/CaptchaCacheServiceProvider.java | 3 ++- xiaonuo-main/src/main/resources/application.yml | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/_web/src/views/userLoginReg/Login.vue b/_web/src/views/userLoginReg/Login.vue index ffba2345..86a845ce 100644 --- a/_web/src/views/userLoginReg/Login.vue +++ b/_web/src/views/userLoginReg/Login.vue @@ -86,7 +86,7 @@ diff --git a/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/consts/CommonConstant.java b/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/consts/CommonConstant.java index 0835516b..db881adb 100644 --- a/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/consts/CommonConstant.java +++ b/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/consts/CommonConstant.java @@ -113,7 +113,7 @@ public interface CommonConstant { String DATABASE_URL_NAME = "DATABASE_URL_NAME"; /** - * 滑块验证码 + * 点选验证码 */ - String IMAGE_CODE_TYPE = "blockPuzzle"; + String IMAGE_CODE_TYPE = "clickWord"; } diff --git a/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/context/constant/ConstantContextHolder.java b/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/context/constant/ConstantContextHolder.java index 2213f95e..81c7a9ac 100644 --- a/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/context/constant/ConstantContextHolder.java +++ b/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/context/constant/ConstantContextHolder.java @@ -32,7 +32,6 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.log.Log; import com.cn.xiaonuo.core.consts.CommonConstant; import com.cn.xiaonuo.core.consts.SymbolConstant; -import com.cn.xiaonuo.core.enums.YesOrNotEnum; import com.cn.xiaonuo.core.exception.ServiceException; import com.cn.xiaonuo.core.pojo.email.EmailConfigs; import com.cn.xiaonuo.core.pojo.oauth.OauthConfigs; diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/auth/controller/SysLoginController.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/auth/controller/SysLoginController.java index ef590296..6afc5a65 100644 --- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/auth/controller/SysLoginController.java +++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/auth/controller/SysLoginController.java @@ -36,6 +36,7 @@ import com.cn.xiaonuo.core.exception.enums.AuthExceptionEnum; import com.cn.xiaonuo.core.pojo.response.ResponseData; import com.cn.xiaonuo.core.pojo.response.SuccessResponseData; import com.cn.xiaonuo.sys.modular.auth.service.AuthService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -55,6 +56,7 @@ public class SysLoginController { @Resource private AuthService authService; + @Lazy @Resource private CaptchaService captchaService; diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/provider/CaptchaCacheServiceProvider.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/provider/CaptchaCacheServiceProvider.java index 07237a61..710a10fb 100644 --- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/provider/CaptchaCacheServiceProvider.java +++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/provider/CaptchaCacheServiceProvider.java @@ -8,7 +8,8 @@ import java.util.concurrent.TimeUnit; /** * @ClassName CaptchaCacheServiceProvider - * @Description 验证码 分布式部署 需要使用redis + * @Description 对于分布式部署的应用，我们建议应用自己实现CaptchaCacheService，比如用Redis + * 如果应用是单点的，也没有使用redis，那默认使用内存。内存缓存只适合单节点部署的应用，否则验证码生产与验证在节点之间信息不同步，导致失败 * @Author Jax * @Date 2021/1/21 16:27 **/ diff --git a/xiaonuo-main/src/main/resources/application.yml b/xiaonuo-main/src/main/resources/application.yml index 8ca8b59e..feabf299 100644 --- a/xiaonuo-main/src/main/resources/application.yml +++ b/xiaonuo-main/src/main/resources/application.yml @@ -59,5 +59,5 @@ jodconverter: #验证码相关配置 aj: captcha: - water-font: 宋体 - water-mark: XiaoNuo开发平台 + type: clickword #验证码类型 为点选 + font-type: 宋体