From c446ad55cf53de084145b1403c3a275247e6d9b8 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 20 Apr 2023 20:34:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BA=95=E5=B1=82?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kicc/common/security/service/KiccUserDetailsService.java | 5 +---- .../security/service/impl/KiccAppUserDetailsServiceImpl.java | 4 ++++ .../security/service/impl/KiccUserDetailsServiceImpl.java | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java index aac0b34a..6c6e80ee 100644 --- a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java +++ b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.CommonConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; +import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.system.api.entity.User; import org.springframework.core.Ordered; @@ -53,10 +54,6 @@ public interface KiccUserDetailsService extends UserDetailsService, Ordered { * @return UserDetails */ default UserDetails getUserDetails(R result) { - if (result == null || result.getData() == null) { - throw new UsernameNotFoundException("用户不存在"); - } - User user = result.getData(); Set dbAuthsSet = new HashSet<>(); diff --git a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java index ee4fe52d..a644fad4 100644 --- a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java +++ b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java @@ -2,6 +2,7 @@ package com.cloud.kicc.common.security.service.impl; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.SecurityConstants; +import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.common.security.service.KiccUserDetailsService; import com.cloud.kicc.system.api.entity.User; @@ -34,6 +35,9 @@ public class KiccAppUserDetailsServiceImpl implements KiccUserDetailsService { @SneakyThrows public UserDetails loadUserByUsername(String phone) { R result = remoteUserService.selectByPhone(phone, SecurityConstants.FROM_IN); + if (result == null || result.getData() == null) { + throw new CheckedException("手机号不存在"); + } UserDetails userDetails = getUserDetails(result); return userDetails; } diff --git a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java index 81148d79..edc7a1f0 100644 --- a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java +++ b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java @@ -2,6 +2,7 @@ package com.cloud.kicc.common.security.service.impl; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.SecurityConstants; +import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.common.security.service.KiccUserDetailsService; import com.cloud.kicc.system.api.entity.User; import com.cloud.kicc.system.api.feign.RemoteUserService; @@ -35,6 +36,9 @@ public class KiccUserDetailsServiceImpl implements KiccUserDetailsService { @SneakyThrows public UserDetails loadUserByUsername(String username) { R result = remoteUserService.selectByUserName(username, SecurityConstants.FROM_IN); + if (result == null || result.getData() == null) { + throw new CheckedException("用户不存在"); + } UserDetails userDetails = getUserDetails(result); return userDetails; }