Merge branch 'v2.2.10' into dev

dcb43e64 · 刘基明 · c4e0f227 · 0dc0fa44 · dcb43e64
Commit dcb43e64 authored Nov 11, 2021 by 刘基明
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

OtherUtil.java ...ice/src/main/java/com/tanpu/community/util/OtherUtil.java +2 -2

No files found.
--- a/community-service/src/main/java/com/tanpu/community/util/OtherUtil.java
+++ b/community-service/src/main/java/com/tanpu/community/util/OtherUtil.java
@@ -21,10 +21,10 @@ public class OtherUtil {
    }

    public static String blockPhoneAndEmail(String line) {
-        // 屏蔽手机号
-        line = line.replaceAll(phonePattern,"**********");
        // 屏蔽邮箱
        line =  line.replaceAll(emailPattern,"*@*.com");
+        // 屏蔽手机号
+        line = line.replaceAll(phonePattern,"**********");
        return line;
    }