From 4f0e0c163d6e22aa9705a50ca02cafc7197d2d06 Mon Sep 17 00:00:00 2001 From: Chaos Date: Sun, 23 Nov 2025 21:59:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(auth):=20=E4=BC=98=E5=8C=96=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=9C=8D=E5=8A=A1=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 合并导入Spring Security认证相关类 - 增加对内部认证服务异常的捕获处理 - 保留业务异常的直接抛出 - 完善未知异常的日志记录，包含完整堆栈信息 - 调整设备响应DTO结构，增加字段分隔空行 fix(device): 调整设备响应对象结构 - 在设备响应DTO中添加ID字段上方空行以改善代码可读性 --- .../chaos_api/dto/response/DeviceResponse.java | 1 + .../chaos_api/service/impl/AuthServiceImpl.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/chaos_api_domain/src/main/java/cn/nopj/chaos_api/dto/response/DeviceResponse.java b/chaos_api_domain/src/main/java/cn/nopj/chaos_api/dto/response/DeviceResponse.java index 9bbdda2..8a4638c 100644 --- a/chaos_api_domain/src/main/java/cn/nopj/chaos_api/dto/response/DeviceResponse.java +++ b/chaos_api_domain/src/main/java/cn/nopj/chaos_api/dto/response/DeviceResponse.java @@ -7,6 +7,7 @@ import java.time.LocalDate; @Data public class DeviceResponse { + private Long id; private String name; private String model; diff --git a/chaos_api_web/src/main/java/cn/nopj/chaos_api/service/impl/AuthServiceImpl.java b/chaos_api_web/src/main/java/cn/nopj/chaos_api/service/impl/AuthServiceImpl.java index 0a075f2..23a2b00 100644 --- a/chaos_api_web/src/main/java/cn/nopj/chaos_api/service/impl/AuthServiceImpl.java +++ b/chaos_api_web/src/main/java/cn/nopj/chaos_api/service/impl/AuthServiceImpl.java @@ -13,10 +13,7 @@ import cn.nopj.chaos_api.util.JwtTokenUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.DisabledException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.*; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -87,12 +84,16 @@ public class AuthServiceImpl implements AuthService { res.setTokenHead(tokenHead); return res; - }catch (BadCredentialsException e) { + }catch (BadCredentialsException | InternalAuthenticationServiceException e) { throw new BizException(ErrorCode.USER_NOT_EXISTS_OR_PASSWORD_WRONG); } catch (DisabledException e) { throw new BizException(ErrorCode.USER_NOT_ENABLED); - } catch (Exception e) { - log.error("用户登录异常: {}", e.getMessage()); + } catch (BizException e){ + throw e; + } + catch (Exception e) { + + log.error("用户登录异常",e); throw new BizException(ErrorCode.SYSTEM_ERROR); } }