From 904f9a92b43b920183ef37d494a7ff4ac31acb39 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 22 Apr 2022 10:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84=E6=89=93=E7=A0=81=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=AD=A3=E5=88=99=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/processor/MaskProcessor.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java
index a6b13019a6..353fb06a47 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java
@@ -152,7 +152,9 @@ public class MaskProcessor {
             return originString;
         }
 
-        return originString.replace(originString.substring(6), StrUtil.repeatByLength("*", length - 6));
+        String maskStr = StrUtil.repeatByLength("*", length - 6);
+
+        return originString.replaceAll("^(\\d{6})[a-zA-Z0-9]*$", new StringBuilder("$1").append(maskStr).toString());
     }
 
     /**
@@ -171,4 +173,11 @@ public class MaskProcessor {
 
         return originString.replaceAll("^(1\\d{2})\\d*(\\d{4})$", new StringBuilder("$1").append(maskStr).append("$2").toString());
     }
+
+    public static void main(String[] args) {
+        String[] idc = {"idCard"};
+        String[] idct = {MaskResponse.MASK_TYPE_ID_CARD};
+        String r = new MaskProcessor(idc, idct).maskString("333333333333333333", MaskResponse.MASK_TYPE_ID_CARD);
+        System.out.println(r);
+    }
 }