From 063343565df3fd0743a1063f3d42e00fdc2e9290 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 16 Oct 2023 21:49:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0=E4=B8=8D=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E8=A7=84=E5=88=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/auth/service/impl/LoginServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java index 5a64adee..970d8fa0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java @@ -93,14 +93,18 @@ public class LoginServiceImpl implements LoginService { UserDO user; if (null == userSocial) { String username = authUser.getUsername(); - boolean isMatch = ReUtil.isMatch(RegexConsts.USERNAME, username); + String nickname = authUser.getNickname(); UserDO existsUser = userService.getByUsername(username); - if (null != existsUser || !isMatch) { - username = RandomUtil.randomString(RandomUtil.BASE_CHAR, 5) + IdUtil.fastSimpleUUID(); + String randomStr = RandomUtil.randomString(RandomUtil.BASE_CHAR, 5); + if (null != existsUser || !ReUtil.isMatch(RegexConsts.USERNAME, username)) { + username = randomStr + IdUtil.fastSimpleUUID(); + } + if (!ReUtil.isMatch(RegexConsts.GENERAL_NAME, nickname)) { + nickname = source.toLowerCase() + randomStr; } user = new UserDO(); user.setUsername(username); - user.setNickname(authUser.getNickname()); + user.setNickname(nickname); user.setGender(GenderEnum.valueOf(authUser.getGender().name())); user.setAvatar(authUser.getAvatar()); user.setDeptId(SysConsts.SUPER_DEPT_ID);