From 5fd16ff806e7878c2da5a44bbc71bd214ae2cc55 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Mon, 13 Jun 2022 20:49:34 +0800
Subject: [PATCH] !202 update ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java. Merge pull request !202 from 光速蜗牛/N/A
---
ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
index 873ef39..8d2c180 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
@@ -11,11 +11,12 @@
import com.google.code.kaptcha.Producer;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.exception.CaptchaException;
-import com.ruoyi.common.core.utils.IdUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.sign.Base64;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.gateway.config.properties.CaptchaProperties;
import com.ruoyi.gateway.service.ValidateCodeService;
/**
@@ -35,15 +36,23 @@
@Autowired
private RedisService redisService;
- // 验证码类型
- private String captchaType = "math";
+ @Autowired
+ private CaptchaProperties captchaProperties;
/**
* 生成验证码
*/
@Override
- public AjaxResult createCapcha() throws IOException, CaptchaException
+ public AjaxResult createCaptcha() throws IOException, CaptchaException
{
+ AjaxResult ajax = AjaxResult.success();
+ boolean captchaOnOff = captchaProperties.getEnabled();
+ ajax.put("captchaOnOff", captchaOnOff);
+ if (!captchaOnOff)
+ {
+ return ajax;
+ }
+
// 保存验证码信息
String uuid = IdUtils.simpleUUID();
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
@@ -51,6 +60,7 @@
String capStr = null, code = null;
BufferedImage image = null;
+ String captchaType = captchaProperties.getType();
// 生成验证码
if ("math".equals(captchaType))
{
@@ -77,7 +87,6 @@
return AjaxResult.error(e.getMessage());
}
- AjaxResult ajax = AjaxResult.success();
ajax.put("uuid", uuid);
ajax.put("img", Base64.encode(os.toByteArray()));
return ajax;
@@ -87,7 +96,7 @@
* 校验验证码
*/
@Override
- public void checkCapcha(String code, String uuid) throws CaptchaException
+ public void checkCaptcha(String code, String uuid) throws CaptchaException
{
if (StringUtils.isEmpty(code))
{
--
Gitblit v1.9.3