From 27eddbd87928f504893ccd9209423eaf813559a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com>
Date: Thu, 27 Feb 2025 09:18:49 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BB=A3=E7=A0=81=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/tool/sensitive/SensitiveType.java     | 18 ++++++++++--------
 .../core/tool/sensitive/SensitiveUtil.java     |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/sensitive/SensitiveType.java b/blade-core-tool/src/main/java/org/springblade/core/tool/sensitive/SensitiveType.java
index 6c98db8..579d18f 100644
--- a/blade-core-tool/src/main/java/org/springblade/core/tool/sensitive/SensitiveType.java
+++ b/blade-core-tool/src/main/java/org/springblade/core/tool/sensitive/SensitiveType.java
@@ -15,8 +15,6 @@
  */
 package org.springblade.core.tool.sensitive;
 
-import lombok.Getter;
-
 import java.util.regex.Pattern;
 
 /**
@@ -24,7 +22,6 @@ import java.util.regex.Pattern;
  *
  * @author BladeX
  */
-@Getter
 public enum SensitiveType {
 	GLOBAL("全局", "(.{2}).*(.{2})", "$1****$2"),
 	MOBILE("手机号", "(\\d{3})\\d{4}(\\d{4})", "$1****$2"),
@@ -35,15 +32,20 @@ public enum SensitiveType {
 	MAC_ADDRESS("MAC地址", "([0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}):[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}", "$1:****"),
 	;
 
-	private final String desc;
-	private final String regex;
 	private final String replacement;
 	private final Pattern pattern;
 
-	SensitiveType(String desc, String regex, String replacement) {
-		this.desc = desc;
-		this.regex = regex;
+	SensitiveType(String ignore, String regex, String replacement) {
 		this.replacement = replacement;
 		this.pattern = Pattern.compile(regex);
 	}
+
+	/**
+	 * 替换文本
+	 * @param content content
+	 * @return 替换后的内容
+	 */
+	public String replaceAll(String content) {
+		return this.pattern.matcher(content).replaceAll(this.replacement);
+	}
 }
diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/sensitive/SensitiveUtil.java b/blade-core-tool/src/main/java/org/springblade/core/tool/sensitive/SensitiveUtil.java
index b28e0e3..29b5363 100644
--- a/blade-core-tool/src/main/java/org/springblade/core/tool/sensitive/SensitiveUtil.java
+++ b/blade-core-tool/src/main/java/org/springblade/core/tool/sensitive/SensitiveUtil.java
@@ -196,7 +196,7 @@ public class SensitiveUtil {
 	private static String processRegexPatterns(String content, Set<SensitiveType> types) {
 		String result = content;
 		for (SensitiveType type : types) {
-			result = type.getPattern().matcher(result).replaceAll(type.getReplacement());
+			result = type.replaceAll(result);
 		}
 		return result;
 	}