Index: ssts-web/src/test/java/test/forgon/tools/util/StringUtilTests.java =================================================================== diff -u -r41200 -r41202 --- ssts-web/src/test/java/test/forgon/tools/util/StringUtilTests.java (.../StringUtilTests.java) (revision 41200) +++ ssts-web/src/test/java/test/forgon/tools/util/StringUtilTests.java (.../StringUtilTests.java) (revision 41202) @@ -26,7 +26,7 @@ //空白 assertEquals(StringUtil.maskName(""), ""); //字符串长度小于2 - assertEquals(StringUtil.maskName("a"), "a"); + assertEquals(StringUtil.maskName("a"), "a**"); //字符串长度等于2 assertEquals(StringUtil.maskName("张三"), "张*三"); //字符串长度大于2 @@ -40,8 +40,8 @@ public void testMaskPhoneNumber(){ //空白 assertEquals(StringUtil.maskPhoneNumber(""), ""); - //字符串长度小于2 - assertEquals(StringUtil.maskPhoneNumber("1"), "1"); + //字符串长度小于7 + assertEquals(StringUtil.maskPhoneNumber("1"), "1**********"); //字符串长度等于7 assertEquals(StringUtil.maskPhoneNumber("1231234"), "123****1234"); //字符串长度大于7 @@ -56,7 +56,7 @@ //空白 assertEquals(StringUtil.maskIDCardNumber(""), ""); //字符串长度小于5 - assertEquals(StringUtil.maskIDCardNumber("1"), "1"); + assertEquals(StringUtil.maskIDCardNumber("1"), "1*****************"); //字符串长度等于5 assertEquals(StringUtil.maskIDCardNumber("12312"), "123*************12"); //字符串长度小于5 Index: forgon-core/src/main/java/com/forgon/util/StringUtil.java =================================================================== diff -u -r41200 -r41202 --- forgon-core/src/main/java/com/forgon/util/StringUtil.java (.../StringUtil.java) (revision 41200) +++ forgon-core/src/main/java/com/forgon/util/StringUtil.java (.../StringUtil.java) (revision 41202) @@ -760,7 +760,8 @@ } int length = name.length(); if(length == 1){ - return name; + name = name + "*"; + length = name.length(); } return name.charAt(0) + "*" + name.charAt(length - 1); } @@ -776,7 +777,10 @@ } int length = theIDCardNumber.length(); if(length < 5){ - return theIDCardNumber; + for(int i=0;i<5-length;i++){ + theIDCardNumber = theIDCardNumber + "*"; + } + length = theIDCardNumber.length(); } return theIDCardNumber.substring(0, 3) + "*************" + theIDCardNumber.substring(length - 2); @@ -793,7 +797,10 @@ } int length = phoneNumber.length(); if(length < 7){ - return phoneNumber; + for(int i=0; i<7-length; i++){ + phoneNumber = phoneNumber + "*"; + } + length = phoneNumber.length(); } return phoneNumber.substring(0, 3) + "****" + phoneNumber.substring(length-4);