From e5252961bd215c8466b289f9134f69b7f8c209c8 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 14 May 2025 14:36:29 +0900 Subject: [PATCH 1/2] loopback --- src/main/java/co/jp/app/common/ApiResponse.java | 4 ++++ .../jp/app/config/security/SecurityConfig.java | 7 ++----- .../filter/JwtAuthenticationFilter.java | 17 ++++++----------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/co/jp/app/common/ApiResponse.java b/src/main/java/co/jp/app/common/ApiResponse.java index e31a684..8935c64 100644 --- a/src/main/java/co/jp/app/common/ApiResponse.java +++ b/src/main/java/co/jp/app/common/ApiResponse.java @@ -2,9 +2,13 @@ package co.jp.app.common; public class ApiResponse { + //状态判定 private boolean success; + //状况码 private int code; + //状态信息 private String message; + //数据 private T data; private ApiResponse(ResultCode resultCode, T data) { diff --git a/src/main/java/co/jp/app/config/security/SecurityConfig.java b/src/main/java/co/jp/app/config/security/SecurityConfig.java index 3bbfdd4..b0af187 100644 --- a/src/main/java/co/jp/app/config/security/SecurityConfig.java +++ b/src/main/java/co/jp/app/config/security/SecurityConfig.java @@ -1,9 +1,6 @@ package co.jp.app.config.security; -<<<<<<< HEAD -======= import co.jp.app.config.security.filter.JwtAuthenticationFilter; ->>>>>>> 2aae88278c46cf937380317aae1f9d229bcb3c37 import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; @@ -13,12 +10,12 @@ import org.springframework.security.authentication.dao.DaoAuthenticationProvider import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; - -import co.jp.app.config.security.filter.JwtAuthenticationFilter; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @Configuration public class SecurityConfig { diff --git a/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java b/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java index 802300b..2156dd0 100644 --- a/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java @@ -1,7 +1,12 @@ package co.jp.app.config.security.filter; +import co.jp.app.service.JwtService; import java.io.IOException; - +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.context.annotation.Lazy; import org.springframework.lang.NonNull; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; @@ -11,16 +16,6 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -<<<<<<< HEAD -import co.jp.app.service.JwtService; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - - -======= ->>>>>>> 2aae88278c46cf937380317aae1f9d229bcb3c37 @Component public class JwtAuthenticationFilter extends OncePerRequestFilter { From 30281a40b54a862d64e0c27cd5fbf69c942a6017 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 14 May 2025 14:36:57 +0900 Subject: [PATCH 2/2] loopback --- .../java/co/jp/app/exception/GlobalExceptionHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java b/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java index 4b34f1f..0482aaf 100644 --- a/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java +++ b/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java @@ -1,11 +1,14 @@ package co.jp.app.exception; -import java.util.stream.Collectors; +import co.jp.app.common.ApiResponse; +import co.jp.app.common.ResultCode; +import co.jp.app.exception.BusinessException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.userdetails.UsernameNotFoundException; @@ -15,8 +18,7 @@ import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import co.jp.app.common.ApiResponse; -import co.jp.app.common.ResultCode; +import java.util.stream.Collectors; @RestControllerAdvice public class GlobalExceptionHandler {