|  | @@ -1,16 +1,20 @@
 | 
											
												
													
														|  |  package com.ruoyi.web.controller.common;
 |  |  package com.ruoyi.web.controller.common;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -import java.io.ByteArrayOutputStream;
 |  | 
 | 
											
												
													
														|  | 
 |  | +import java.awt.image.BufferedImage;
 | 
											
												
													
														|  |  import java.io.IOException;
 |  |  import java.io.IOException;
 | 
											
												
													
														|  |  import java.util.concurrent.TimeUnit;
 |  |  import java.util.concurrent.TimeUnit;
 | 
											
												
													
														|  | 
 |  | +import javax.annotation.Resource;
 | 
											
												
													
														|  | 
 |  | +import javax.imageio.ImageIO;
 | 
											
												
													
														|  |  import javax.servlet.http.HttpServletResponse;
 |  |  import javax.servlet.http.HttpServletResponse;
 | 
											
												
													
														|  |  import org.springframework.beans.factory.annotation.Autowired;
 |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
											
												
													
														|  | 
 |  | +import org.springframework.beans.factory.annotation.Value;
 | 
											
												
													
														|  | 
 |  | +import org.springframework.util.FastByteArrayOutputStream;
 | 
											
												
													
														|  |  import org.springframework.web.bind.annotation.GetMapping;
 |  |  import org.springframework.web.bind.annotation.GetMapping;
 | 
											
												
													
														|  |  import org.springframework.web.bind.annotation.RestController;
 |  |  import org.springframework.web.bind.annotation.RestController;
 | 
											
												
													
														|  | 
 |  | +import com.google.code.kaptcha.Producer;
 | 
											
												
													
														|  |  import com.ruoyi.common.constant.Constants;
 |  |  import com.ruoyi.common.constant.Constants;
 | 
											
												
													
														|  |  import com.ruoyi.common.core.domain.AjaxResult;
 |  |  import com.ruoyi.common.core.domain.AjaxResult;
 | 
											
												
													
														|  |  import com.ruoyi.common.core.redis.RedisCache;
 |  |  import com.ruoyi.common.core.redis.RedisCache;
 | 
											
												
													
														|  | -import com.ruoyi.common.utils.VerifyCodeUtils;
 |  | 
 | 
											
												
													
														|  |  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;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -22,8 +26,18 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 | 
											
												
													
														|  |  @RestController
 |  |  @RestController
 | 
											
												
													
														|  |  public class CaptchaController
 |  |  public class CaptchaController
 | 
											
												
													
														|  |  {
 |  |  {
 | 
											
												
													
														|  | 
 |  | +    @Resource(name = "captchaProducer")
 | 
											
												
													
														|  | 
 |  | +    private Producer captchaProducer;
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +    @Resource(name = "captchaProducerMath")
 | 
											
												
													
														|  | 
 |  | +    private Producer captchaProducerMath;
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |      @Autowired
 |  |      @Autowired
 | 
											
												
													
														|  |      private RedisCache redisCache;
 |  |      private RedisCache redisCache;
 | 
											
												
													
														|  | 
 |  | +    
 | 
											
												
													
														|  | 
 |  | +    // 验证码类型
 | 
											
												
													
														|  | 
 |  | +    @Value("${ruoyi.captchaType}")
 | 
											
												
													
														|  | 
 |  | +    private String captchaType;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      /**
 |  |      /**
 | 
											
												
													
														|  |       * 生成验证码
 |  |       * 生成验证码
 | 
											
										
											
												
													
														|  | @@ -31,32 +45,42 @@ public class CaptchaController
 | 
											
												
													
														|  |      @GetMapping("/captchaImage")
 |  |      @GetMapping("/captchaImage")
 | 
											
												
													
														|  |      public AjaxResult getCode(HttpServletResponse response) throws IOException
 |  |      public AjaxResult getCode(HttpServletResponse response) throws IOException
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  | -        // 生成随机字串
 |  | 
 | 
											
												
													
														|  | -        String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
 |  | 
 | 
											
												
													
														|  | -        // 唯一标识
 |  | 
 | 
											
												
													
														|  | 
 |  | +        // 保存验证码信息
 | 
											
												
													
														|  |          String uuid = IdUtils.simpleUUID();
 |  |          String uuid = IdUtils.simpleUUID();
 | 
											
												
													
														|  |          String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
 |  |          String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -        redisCache.setCacheObject(verifyKey, verifyCode, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
 |  | 
 | 
											
												
													
														|  | -        // 生成图片
 |  | 
 | 
											
												
													
														|  | -        int w = 111, h = 36;
 |  | 
 | 
											
												
													
														|  | -        ByteArrayOutputStream stream = new ByteArrayOutputStream();
 |  | 
 | 
											
												
													
														|  | -        VerifyCodeUtils.outputImage(w, h, stream, verifyCode);
 |  | 
 | 
											
												
													
														|  | -        try
 |  | 
 | 
											
												
													
														|  | 
 |  | +        String capStr = null, code = null;
 | 
											
												
													
														|  | 
 |  | +        BufferedImage image = null;
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +        // 生成验证码
 | 
											
												
													
														|  | 
 |  | +        if ("math".equals(captchaType))
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  | -            AjaxResult ajax = AjaxResult.success();
 |  | 
 | 
											
												
													
														|  | -            ajax.put("uuid", uuid);
 |  | 
 | 
											
												
													
														|  | -            ajax.put("img", Base64.encode(stream.toByteArray()));
 |  | 
 | 
											
												
													
														|  | -            return ajax;
 |  | 
 | 
											
												
													
														|  | 
 |  | +            String capText = captchaProducerMath.createText();
 | 
											
												
													
														|  | 
 |  | +            capStr = capText.substring(0, capText.lastIndexOf("@"));
 | 
											
												
													
														|  | 
 |  | +            code = capText.substring(capText.lastIndexOf("@") + 1);
 | 
											
												
													
														|  | 
 |  | +            image = captchaProducerMath.createImage(capStr);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        catch (Exception e)
 |  | 
 | 
											
												
													
														|  | 
 |  | +        else if ("char".equals(captchaType))
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  | -            e.printStackTrace();
 |  | 
 | 
											
												
													
														|  | -            return AjaxResult.error(e.getMessage());
 |  | 
 | 
											
												
													
														|  | 
 |  | +            capStr = code = captchaProducer.createText();
 | 
											
												
													
														|  | 
 |  | +            image = captchaProducer.createImage(capStr);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        finally
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
 | 
											
												
													
														|  | 
 |  | +        // 转换流信息写出
 | 
											
												
													
														|  | 
 |  | +        FastByteArrayOutputStream os = new FastByteArrayOutputStream();
 | 
											
												
													
														|  | 
 |  | +        try
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  | -            stream.close();
 |  | 
 | 
											
												
													
														|  | 
 |  | +            ImageIO.write(image, "jpg", os);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | 
 |  | +        catch (IOException e)
 | 
											
												
													
														|  | 
 |  | +        {
 | 
											
												
													
														|  | 
 |  | +            return AjaxResult.error(e.getMessage());
 | 
											
												
													
														|  | 
 |  | +        }
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +        AjaxResult ajax = AjaxResult.success();
 | 
											
												
													
														|  | 
 |  | +        ajax.put("uuid", uuid);
 | 
											
												
													
														|  | 
 |  | +        ajax.put("img", Base64.encode(os.toByteArray()));
 | 
											
												
													
														|  | 
 |  | +        return ajax;
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  }
 |  |  }
 |