From a9af60de1e7fab9672afacb121aa3fd2549a5b69 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Sat, 1 May 2021 12:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 basic-util/src/main/java/ink/wgink/util/RegexUtil.java          | 2 +-
 .../src/main/java/ink/wgink/common/aspect/ApiParamsAspect.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/basic-util/src/main/java/ink/wgink/util/RegexUtil.java b/basic-util/src/main/java/ink/wgink/util/RegexUtil.java
index d6188d74..7bfb0ab1 100644
--- a/basic-util/src/main/java/ink/wgink/util/RegexUtil.java
+++ b/basic-util/src/main/java/ink/wgink/util/RegexUtil.java
@@ -78,7 +78,7 @@ public class RegexUtil {
     /**
      * 用户名
      */
-    private static final Pattern PATTERN_USERNAME = Pattern.compile("^[a-zA-Z0-9_\\s]+$");
+    private static final Pattern PATTERN_USERNAME = Pattern.compile("^[a-zA-Z0-9\\-\\_\\!\\@\\#\\%\\.]+$");
     /**
      * 字母
      */
diff --git a/common/src/main/java/ink/wgink/common/aspect/ApiParamsAspect.java b/common/src/main/java/ink/wgink/common/aspect/ApiParamsAspect.java
index 03d767a2..ff690cb7 100644
--- a/common/src/main/java/ink/wgink/common/aspect/ApiParamsAspect.java
+++ b/common/src/main/java/ink/wgink/common/aspect/ApiParamsAspect.java
@@ -213,7 +213,7 @@ public class ApiParamsAspect {
         }
         if (StringUtils.equals("username", verifyType)) {
             if (!RegexUtil.isUsername(value)) {
-                throw new ParamsException(String.format("%s格式只能是字母、数字和下划线", name));
+                throw new ParamsException(String.format("%s格式只能包含字母、数字、-_!@#%.", name));
             }
             return;
         } else if (StringUtils.equals("phone", verifyType)) {