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); } }