From 1f9717855302895af2f0ef3133165334125bbbf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 31 Mar 2023 10:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SqlUtil=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/online/cgreport/util/SqlUtil.java | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java
index 081e6314..0454b260 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java
@@ -1,19 +1,18 @@
 
 package com.jero.generater.modules.online.cgreport.util;
 
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.oConvertUtils;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 @Slf4j
 public class SqlUtil {
 
@@ -143,10 +142,10 @@ public class SqlUtil {
 
     public static String a(String var0) {
         var0 = var0.toLowerCase();
-        String var1 = "(\\w|\\.)+ *\\S+ *\\S*\\$\\{\\w+\\}\\S*";
+        String var1 = "[\\w.]*+ *\\S+ *\\S*\\$\\{\\w+}\\S*";
         Pattern var2 = Pattern.compile(var1);
 
-        for(Matcher var3 = var2.matcher(var0); var3.find(); log.info("${}替换后结果 ==>" + var0)) {
+        for(Matcher var3 = var2.matcher(var0); var3.find();) {
             String var4 = var3.group();
             log.info("${}匹配带参SQL片段 ==>" + var4);
             if (var4.contains("where")) {
@@ -158,6 +157,7 @@ public class SqlUtil {
             } else {
                 var0 = var0.replace(var4, "1=1");
             }
+            log.info("${}替换后结果 ==>" + var0);
         }
 
         var0 = var0.replaceAll("(?i)AND *1=1", "");
@@ -172,14 +172,11 @@ public class SqlUtil {
     public static Map<String, Object> a(HttpServletRequest var0) {
         Map<String, String[]> var1 = var0.getParameterMap();
         HashMap<String, Object> var2 = new HashMap<>();
-        Iterator<Entry<String, String[]>> var3 = var1.entrySet().iterator();
-        String var5 = "";
-        String var6 = "";
 
-        for(String[] var7; var3.hasNext(); var2.put(var5, var6)) {
-            Entry<String, String[]> var4 = var3.next();
-            var5 = var4.getKey();
-            var7 = var4.getValue();
+        for(Map.Entry<String, String[]> entry: var1.entrySet()) {
+            String var5 = entry.getKey();
+            String[] var7 = entry.getValue();
+            String var6 = "";
             if (!"_t".equals(var5) && null != var7) {
                 if (!(var7 instanceof String[])) {
                     var6 = Arrays.toString(var7);
@@ -194,6 +191,7 @@ public class SqlUtil {
             } else {
                 var6 = "";
             }
+            var2.put(var5, var6);
         }
 
         return var2;