|
|
@ -1,15 +1,5 @@
|
|
|
|
package com.ruoyi.web.controller.common;
|
|
|
|
package com.ruoyi.web.controller.common;
|
|
|
|
|
|
|
|
|
|
|
|
import java.awt.image.BufferedImage;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
import javax.imageio.ImageIO;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
import org.springframework.util.FastByteArrayOutputStream;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
import com.google.code.kaptcha.Producer;
|
|
|
|
import com.google.code.kaptcha.Producer;
|
|
|
|
import com.ruoyi.common.config.RuoYiConfig;
|
|
|
|
import com.ruoyi.common.config.RuoYiConfig;
|
|
|
|
import com.ruoyi.common.constant.CacheConstants;
|
|
|
|
import com.ruoyi.common.constant.CacheConstants;
|
|
|
@ -19,6 +9,17 @@ import com.ruoyi.common.core.redis.RedisCache;
|
|
|
|
import com.ruoyi.common.utils.sign.Base64;
|
|
|
|
import com.ruoyi.common.utils.sign.Base64;
|
|
|
|
import com.ruoyi.common.utils.uuid.IdUtils;
|
|
|
|
import com.ruoyi.common.utils.uuid.IdUtils;
|
|
|
|
import com.ruoyi.system.service.ISysConfigService;
|
|
|
|
import com.ruoyi.system.service.ISysConfigService;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
import org.springframework.util.FastByteArrayOutputStream;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
import javax.imageio.ImageIO;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
import java.awt.image.BufferedImage;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 验证码操作处理
|
|
|
|
* 验证码操作处理
|
|
|
@ -26,8 +27,7 @@ import com.ruoyi.system.service.ISysConfigService;
|
|
|
|
* @author ruoyi
|
|
|
|
* @author ruoyi
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@RestController
|
|
|
|
@RestController
|
|
|
|
public class CaptchaController
|
|
|
|
public class CaptchaController {
|
|
|
|
{
|
|
|
|
|
|
|
|
@Resource(name = "captchaProducer")
|
|
|
|
@Resource(name = "captchaProducer")
|
|
|
|
private Producer captchaProducer;
|
|
|
|
private Producer captchaProducer;
|
|
|
|
|
|
|
|
|
|
|
@ -39,17 +39,16 @@ public class CaptchaController
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private ISysConfigService configService;
|
|
|
|
private ISysConfigService configService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 生成验证码
|
|
|
|
* 生成验证码
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@GetMapping("/captchaImage")
|
|
|
|
@GetMapping("/captchaImage")
|
|
|
|
public AjaxResult getCode(HttpServletResponse response) throws IOException
|
|
|
|
public AjaxResult getCode(HttpServletResponse response) throws IOException {
|
|
|
|
{
|
|
|
|
|
|
|
|
AjaxResult ajax = AjaxResult.success();
|
|
|
|
AjaxResult ajax = AjaxResult.success();
|
|
|
|
boolean captchaEnabled = configService.selectCaptchaEnabled();
|
|
|
|
boolean captchaEnabled = configService.selectCaptchaEnabled();
|
|
|
|
ajax.put("captchaEnabled", captchaEnabled);
|
|
|
|
ajax.put("captchaEnabled", captchaEnabled);
|
|
|
|
if (!captchaEnabled)
|
|
|
|
if (!captchaEnabled) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return ajax;
|
|
|
|
return ajax;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -62,15 +61,12 @@ public class CaptchaController
|
|
|
|
|
|
|
|
|
|
|
|
// 生成验证码
|
|
|
|
// 生成验证码
|
|
|
|
String captchaType = RuoYiConfig.getCaptchaType();
|
|
|
|
String captchaType = RuoYiConfig.getCaptchaType();
|
|
|
|
if ("math".equals(captchaType))
|
|
|
|
if ("math".equals(captchaType)) {
|
|
|
|
{
|
|
|
|
|
|
|
|
String capText = captchaProducerMath.createText();
|
|
|
|
String capText = captchaProducerMath.createText();
|
|
|
|
capStr = capText.substring(0, capText.lastIndexOf("@"));
|
|
|
|
capStr = capText.substring(0, capText.lastIndexOf("@"));
|
|
|
|
code = capText.substring(capText.lastIndexOf("@") + 1);
|
|
|
|
code = capText.substring(capText.lastIndexOf("@") + 1);
|
|
|
|
image = captchaProducerMath.createImage(capStr);
|
|
|
|
image = captchaProducerMath.createImage(capStr);
|
|
|
|
}
|
|
|
|
} else if ("char".equals(captchaType)) {
|
|
|
|
else if ("char".equals(captchaType))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
capStr = code = captchaProducer.createText();
|
|
|
|
capStr = code = captchaProducer.createText();
|
|
|
|
image = captchaProducer.createImage(capStr);
|
|
|
|
image = captchaProducer.createImage(capStr);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -78,12 +74,9 @@ public class CaptchaController
|
|
|
|
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
|
|
|
|
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
|
|
|
|
// 转换流信息写出
|
|
|
|
// 转换流信息写出
|
|
|
|
FastByteArrayOutputStream os = new FastByteArrayOutputStream();
|
|
|
|
FastByteArrayOutputStream os = new FastByteArrayOutputStream();
|
|
|
|
try
|
|
|
|
try {
|
|
|
|
{
|
|
|
|
|
|
|
|
ImageIO.write(image, "jpg", os);
|
|
|
|
ImageIO.write(image, "jpg", os);
|
|
|
|
}
|
|
|
|
} catch (IOException e) {
|
|
|
|
catch (IOException e)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return AjaxResult.error(e.getMessage());
|
|
|
|
return AjaxResult.error(e.getMessage());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|