Merge remote-tracking branch 'origin/master'

src/main/java/co/jp/app/common/ApiResponse.java

@@ -2,13 +2,9 @@ package co.jp.app.common;
 
 
 public class ApiResponse<T> {
-    //状态判定
     private boolean success;
-    //状况码
     private int code;
-    //状态信息
     private String message;
-    //数据
     private T data;
 
     //空构造函数

src/main/java/co/jp/app/config/security/SecurityConfig.java

@@ -1,6 +1,9 @@
 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;
@@ -10,12 +13,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 org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+import co.jp.app.config.security.filter.JwtAuthenticationFilter;
 
 @Configuration
 public class SecurityConfig {

src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java

@@ -1,12 +1,7 @@
 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;
@@ -16,6 +11,16 @@ 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 {
 

src/main/java/co/jp/app/exception/GlobalExceptionHandler.java

@@ -1,14 +1,11 @@
 package co.jp.app.exception;
 
-import co.jp.app.common.ApiResponse;
-import co.jp.app.common.ResultCode;
-import co.jp.app.exception.BusinessException;
+import java.util.stream.Collectors;
 
 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;
@@ -18,7 +15,8 @@ import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import java.util.stream.Collectors;
+import co.jp.app.common.ApiResponse;
+import co.jp.app.common.ResultCode;
 
 @RestControllerAdvice
 public class GlobalExceptionHandler {