From ac46d387bdecc1ea81e683c4838df8ddddfea111 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 20 Apr 2023 21:20:04 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../override/KiccWebResponseExceptionTranslator.java | 6 ++---- .../service/impl/KiccAppUserDetailsServiceImpl.java | 4 ++-- .../security/service/impl/KiccUserDetailsServiceImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/override/KiccWebResponseExceptionTranslator.java b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/override/KiccWebResponseExceptionTranslator.java index d8aa1c5b..ddb7908b 100644 --- a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/override/KiccWebResponseExceptionTranslator.java +++ b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/override/KiccWebResponseExceptionTranslator.java @@ -34,14 +34,12 @@ public class KiccWebResponseExceptionTranslator implements WebResponseExceptionT Throwable[] causeChain = throwableAnalyzer.determineCauseChain(e); - Exception ase = (AuthenticationException) throwableAnalyzer - .getFirstThrowableOfType(AuthenticationException.class, causeChain); + Exception ase = (AuthenticationException) throwableAnalyzer.getFirstThrowableOfType(AuthenticationException.class, causeChain); if (ase != null) { return handleOAuth2Exception(new UnauthorizedException(e.getMessage(), e)); } - ase = (AccessDeniedException) throwableAnalyzer.getFirstThrowableOfType(AccessDeniedException.class, - causeChain); + ase = (AccessDeniedException) throwableAnalyzer.getFirstThrowableOfType(AccessDeniedException.class, causeChain); if (ase != null) { return handleOAuth2Exception(new ForbiddenException(ase.getMessage(), ase)); } 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 a644fad4..6781a0b3 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,7 +2,6 @@ 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; @@ -11,6 +10,7 @@ import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** *

@@ -36,7 +36,7 @@ public class KiccAppUserDetailsServiceImpl implements KiccUserDetailsService { public UserDetails loadUserByUsername(String phone) { R result = remoteUserService.selectByPhone(phone, SecurityConstants.FROM_IN); if (result == null || result.getData() == null) { - throw new CheckedException("手机号不存在"); + throw new UsernameNotFoundException("手机号不存在!"); } 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 edc7a1f0..7625ab9c 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,7 +2,6 @@ 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; @@ -11,6 +10,7 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Primary; import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** *

@@ -37,7 +37,7 @@ public class KiccUserDetailsServiceImpl implements KiccUserDetailsService { public UserDetails loadUserByUsername(String username) { R result = remoteUserService.selectByUserName(username, SecurityConstants.FROM_IN); if (result == null || result.getData() == null) { - throw new CheckedException("用户不存在"); + throw new UsernameNotFoundException("用户不存在!"); } UserDetails userDetails = getUserDetails(result); return userDetails;