From 306ac16a77d38711f88af18ff049e0eab04f922a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 7 Jan 2025 17:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E5=8F=8A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=BF=E9=97=AE=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/AuthorizationInterceptor.java | 3 ++- .../app/service/impl/UserServiceImpl.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/interceptor/AuthorizationInterceptor.java b/src/main/java/com/sqx/modules/app/interceptor/AuthorizationInterceptor.java index aaa08332..86aab68b 100644 --- a/src/main/java/com/sqx/modules/app/interceptor/AuthorizationInterceptor.java +++ b/src/main/java/com/sqx/modules/app/interceptor/AuthorizationInterceptor.java @@ -115,7 +115,8 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { if (userInfo != null && StrUtil.isNotBlank(userInfo.getCertNo())) { TbUserBlacklist blacklist = tbUserBlacklistMapper.selectOne(Wrappers.lambdaQuery().eq(TbUserBlacklist::getIdCardNo, userInfo.getCertNo())); if (blacklist != null) { - throw new CzgException(StrUtil.format("黑名单用户，禁止访问：{} / {}", blacklist.getRealName(), blacklist.getIdCardNo())); + // 提出用户 + throw new SqxException(jwtUtils.getHeader() + "失效，请重新登录", HttpStatus.UNAUTHORIZED.value()); } } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 4772712b..b105a876 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -881,15 +881,6 @@ public class UserServiceImpl extends ServiceImpl implements String inviterCode, String wxId, String qdCode) { //校验手机号是否存在 UserEntity userInfo = queryByPhone(phone); - // 实名认证信息 - UserInfo idCardAuth = userInfoService.getByUserId(userInfo.getUserId()); - if (idCardAuth != null && StrUtil.isNotBlank(idCardAuth.getCertNo())) { - TbUserBlacklist blacklist = tbUserBlacklistMapper.selectOne(Wrappers.lambdaQuery().eq(TbUserBlacklist::getIdCardNo, idCardAuth.getCertNo())); - // 如果被拉黑了，不要提示的那么直白，需要换个说法 - if (blacklist != null) { - return Result.error("系统正在维护中，请稍后再试！"); - } - } if (userInfo != null) { if (StringUtils.isNotEmpty(password)) { //密码登录 @@ -916,6 +907,15 @@ public class UserServiceImpl extends ServiceImpl implements if (StringUtils.isNotEmpty(wxId) && StringUtils.isNotEmpty(userInfo.getWxId()) && !wxId.equals(userInfo.getWxId())) { return Result.error("当前手机号已经绑定过了，请更换其他手机号！"); } + // 实名认证信息 + UserInfo idCardAuth = userInfoService.getByUserId(userInfo.getUserId()); + if (idCardAuth != null && StrUtil.isNotBlank(idCardAuth.getCertNo())) { + TbUserBlacklist blacklist = tbUserBlacklistMapper.selectOne(Wrappers.lambdaQuery().eq(TbUserBlacklist::getIdCardNo, idCardAuth.getCertNo())); + // 如果被拉黑了，不要提示的那么直白，需要换个说法 + if (blacklist != null) { + return Result.error("系统正在维护中，请稍后再试！"); + } + } if (StringUtils.isNotEmpty(wxId)) { userInfo.setWxId(wxId); }