From 1dd4613060269a88832a4eddb6dccaaa7b63c66d Mon Sep 17 00:00:00 2001
From: OTTO <731554297@qq.com>
Date: Tue, 20 Aug 2024 09:13:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91):=20=E4=BA=A7=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=BA=93=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

工具类移动至公共方法：对字符串中，中文部分的内容进行urlEncode
---
 .../common/core/utils/html/EscapeUtil.java    | 35 ++++++++++++++++---
 .../com/microservices/pms/utils/PmsUtils.java | 19 ----------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/utils/html/EscapeUtil.java b/microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/utils/html/EscapeUtil.java
index 4860b2e4b..080f602c4 100644
--- a/microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/utils/html/EscapeUtil.java
+++ b/microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/utils/html/EscapeUtil.java
@@ -1,7 +1,11 @@
 package com.microservices.common.core.utils.html;
 
+import com.microservices.common.core.utils.ServletUtils;
 import com.microservices.common.core.utils.StringUtils;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * 转义和反转义工具类
  *
@@ -30,7 +34,7 @@ public class EscapeUtil
 
     /**
      * 转义文本中的HTML字符为安全的字符
-     * 
+     *
      * @param text 被转义的文本
      * @return 转义后的文本
      */
@@ -41,7 +45,7 @@ public class EscapeUtil
 
     /**
      * 还原被转义的HTML特殊字符
-     * 
+     *
      * @param content 包含转义符的HTML内容
      * @return 转换后的字符串
      */
@@ -52,7 +56,7 @@ public class EscapeUtil
 
     /**
      * 清除所有HTML标签，但是不删除标签内的内容
-     * 
+     *
      * @param content 文本
      * @return 清除标签后的文本
      */
@@ -63,7 +67,7 @@ public class EscapeUtil
 
     /**
      * Escape编码
-     * 
+     *
      * @param text 被编码的文本
      * @return 编码后的字符
      */
@@ -104,7 +108,7 @@ public class EscapeUtil
 
     /**
      * Escape解码
-     * 
+     *
      * @param content 被转义的内容
      * @return 解码后的字符串
      */
@@ -170,4 +174,25 @@ public class EscapeUtil
         }
         return url.replaceAll("(?<!(http:|https:))/+", "/");
     }
+
+    /**
+     * 对字符串中，中文部分的内容进行urlEncode
+     *
+     * @param str 字符串
+     * @return urlEncode后的字符串
+     */
+    public static String encodeChineseCharacters(String str) {
+        // 正则表达式匹配中文字符
+        Pattern pattern = Pattern.compile("[\\u4e00-\\u9fa5，。、；：？！“”‘’【】《》（）\\[\\]{}<>]+");
+        Matcher matcher = pattern.matcher(str);
+
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            // 对匹配到的中文字符进行URL编码
+            String encoded = ServletUtils.urlEncode(matcher.group());
+            matcher.appendReplacement(sb, encoded);
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
 }
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsUtils.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsUtils.java
index 44c7b79e1..7da03914c 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsUtils.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsUtils.java
@@ -1,7 +1,6 @@
 package com.microservices.pms.utils;
 
 import com.microservices.common.core.exception.ServiceException;
-import com.microservices.common.core.utils.ServletUtils;
 import com.microservices.system.api.domain.SysFileBytes;
 import feign.Response;
 
@@ -11,8 +10,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.UUID;
 import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @author otto
@@ -69,22 +66,6 @@ public class PmsUtils {
         }
     }
 
-    // 对字符串中，中文部分的内容进行urlEncode
-    public static String encodeChineseCharacters(String str) {
-        // 正则表达式匹配中文字符
-        Pattern pattern = Pattern.compile("[\u4e00-\u9fa5]");
-        Matcher matcher = pattern.matcher(str);
-
-        StringBuffer sb = new StringBuffer();
-        while (matcher.find()) {
-            // 对匹配到的中文字符进行URL编码
-            String encoded = ServletUtils.urlEncode(matcher.group());
-            matcher.appendReplacement(sb, encoded);
-        }
-        matcher.appendTail(sb);
-        return sb.toString();
-    }
-
     /**
      * 获取文件路径中文件所在的文件夹
      *