fix: 会员注册验证码

novel-common/src/main/java/com/java2nb/novel/core/utils/RandomValidateCodeUtil.java

@@ -1,13 +1,13 @@
 package com.java2nb.novel.core.utils;
 
-import com.java2nb.novel.core.cache.CacheService;
+import lombok.SneakyThrows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.io.OutputStream;
 import java.util.Random;
 
 /**
@@ -18,27 +18,27 @@ public class RandomValidateCodeUtil {
 
     /**
      * 放到session中的key
-     * */
+     */
     public static final String RANDOM_CODE_KEY = "randomValidateCodeKey";
     /**
      * 随机产生只有数字的字符串 private String
-     * */
+     */
     private String randString = "0123456789";
     /**
      * 图片宽
-     * */
+     */
     private int width = 100;
     /**
      * 图片高
-     * */
+     */
     private int height = 38;
     /**
      * 干扰线数量
-     * */
+     */
     private int lineSize = 40;
     /**
      * 随机产生字符数量
-     * */
+     */
     private int stringNum = 4;
 
     private static final Logger logger = LoggerFactory.getLogger(RandomValidateCodeUtil.class);
@@ -69,9 +69,10 @@ public class RandomValidateCodeUtil {
     }
 
     /**
-     * 生成随机图片
+     * 生成随机码图片
      */
-    public void getRandcode(CacheService cacheService, HttpServletResponse response) {
+    @SneakyThrows
+    public String genRandCodeImage(OutputStream out) {
         // BufferedImage类是具有缓冲区的Image类,Image类是用于描述图像信息的类
         BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
         // 产生Image对象的Graphics对象,改对象可以在图像上进行各种绘制操作
@@ -80,7 +81,7 @@ public class RandomValidateCodeUtil {
         g.fillRect(0, 0, width, height);
         //字体大小
         //字体颜色
-        g.setColor(new Color(204,204,204));
+        g.setColor(new Color(204, 204, 204));
         // 绘制干扰线
         for (int i = 0; i <= lineSize; i++) {
             drowLine(g);
@@ -90,17 +91,10 @@ public class RandomValidateCodeUtil {
         for (int i = 1; i <= stringNum; i++) {
             randomString = drowString(g, randomString, i);
         }
-        logger.info(randomString);
-        //将生成的随机字符串保存到缓存中
-        cacheService.set(RANDOM_CODE_KEY,randomString,60*5);
         g.dispose();
-        try {
-            // 将内存中的图片通过流动形式输出到客户端
-            ImageIO.write(image, "JPEG", response.getOutputStream());
-        } catch (Exception e) {
-            logger.error("将内存中的图片通过流动形式输出到客户端失败>>>> ", e);
-        }
-
+        // 将内存中的图片通过流动形式输出到客户端
+        ImageIO.write(image, "JPEG", out);
+        return randomString;
     }
 
     /**
@@ -109,9 +103,9 @@ public class RandomValidateCodeUtil {
     private String drowString(Graphics g, String randomString, int i) {
         g.setFont(getFont());
         g.setColor(new Color(random.nextInt(101), random.nextInt(111), random
-                .nextInt(121)));
+            .nextInt(121)));
         String rand = String.valueOf(getRandomString(random.nextInt(randString
-                .length())));
+            .length())));
         randomString += rand;
         g.translate(random.nextInt(3), random.nextInt(3));
         g.drawString(rand, 13 * i, 23);