From 3b012ef9b0e1179ebac7325e0e982d377e86f8dc Mon Sep 17 00:00:00 2001
From: tianwenbo <tianwenbo@syxysoft.com>
Date: Tue, 7 Mar 2023 15:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20RandImageUtil.j?=
 =?UTF-8?q?ava=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/util/RandImageUtil.java    | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/RandImageUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/RandImageUtil.java
index 9c20aa54..2129ff26 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/RandImageUtil.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/RandImageUtil.java
@@ -14,26 +14,27 @@ import java.util.Random;
  */
 public class RandImageUtil {
 
-    public static final String key = "JERO_LOGIN_KEY";
+    public static final String KEY = "JERO_LOGIN_KEY";
+//    public static final String key = "JERO_LOGIN_KEY";
 
     /**
      * 定义图形大小
      */
-    private static final int width = 105;
+    private static final int WIDTH = 105;
     /**
      * 定义图形大小
      */
-    private static final int height = 35;
+    private static final int HEIGHT = 35;
 
     /**
      * 定义干扰线数量
      */
-    private static final int count = 200;
+    private static final int COUNT = 200;
 
     /**
      * 干扰线的长度=1.414*lineWidth
      */
-    private static final int lineWidth = 2;
+    private static final int LINE_WIDTH = 2;
 
     /**
      * 图片格式
@@ -45,6 +46,12 @@ public class RandImageUtil {
      */
     private static final String BASE64_PRE = "data:image/jpg;base64,";
 
+
+     static final Random random = new Random();
+
+    private RandImageUtil() {
+    }
+
     /**
      * 直接通过response 返回图片
      * @param response
@@ -73,7 +80,7 @@ public class RandImageUtil {
         byte[] bytes = byteStream.toByteArray();
         //转换成base64串
         String base64 = Base64.getEncoder().encodeToString(bytes).trim();
-        base64 = base64.replaceAll("\n", "").replaceAll("\r", "");//删除 \r\n
+        base64 = base64.replace("\n", "").replace("\r", "");//删除 \r\n
 
         //写到指定位置
         //ImageIO.write(bufferedImage, "png", new File(""));
@@ -83,25 +90,25 @@ public class RandImageUtil {
 
     private static BufferedImage getImageBuffer(String resultCode){
         // 在内存中创建图象
-        final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        final BufferedImage image = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
         // 获取图形上下文
         final Graphics2D graphics = (Graphics2D) image.getGraphics();
         // 设定背景颜色
         graphics.setColor(Color.WHITE); // ---1
-        graphics.fillRect(0, 0, width, height);
+        graphics.fillRect(0, 0, WIDTH, HEIGHT);
         // 设定边框颜色
 //		graphics.setColor(getRandColor(100, 200)); // ---2
-        graphics.drawRect(0, 0, width - 1, height - 1);
+        graphics.drawRect(0, 0, WIDTH - 1, HEIGHT - 1);
 
-        final Random random = new Random();
+//        final Random random = new Random();
         // 随机产生干扰线，使图象中的认证码不易被其它程序探测到
-        for (int i = 0; i < count; i++) {
+        for (int i = 0; i < COUNT; i++) {
             graphics.setColor(getRandColor(150, 200)); // ---3
 
-            final int x = random.nextInt(width - lineWidth - 1) + 1; // 保证画在边框之内
-            final int y = random.nextInt(height - lineWidth - 1) + 1;
-            final int xl = random.nextInt(lineWidth);
-            final int yl = random.nextInt(lineWidth);
+            final int x = random.nextInt(WIDTH - LINE_WIDTH - 1) + 1; // 保证画在边框之内
+            final int y = random.nextInt(HEIGHT - LINE_WIDTH - 1) + 1;
+            final int xl = random.nextInt(LINE_WIDTH);
+            final int yl = random.nextInt(LINE_WIDTH);
             graphics.drawLine(x, y, x + xl, y + yl);
         }
         // 取随机产生的认证码
@@ -119,7 +126,7 @@ public class RandImageUtil {
         }
         for(int i = 0; i < 4; i++){
             graphics.setColor(getRandColor(0, 256));
-            graphics.drawLine(0, random.nextInt(height), width, random.nextInt(height));
+            graphics.drawLine(0, random.nextInt(HEIGHT), WIDTH, random.nextInt(HEIGHT));
         }
         // 图象生效
         graphics.dispose();
@@ -127,7 +134,7 @@ public class RandImageUtil {
     }
 
     private static Color getRandColor(int fc, int bc) { // 取得给定范围随机颜色
-        final Random random = new Random();
+//        final Random random = new Random();
         if (fc > 255) {
             fc = 255;
         }