diff --git a/src/main/java/co/jp/app/common/ApiResponse.java b/src/main/java/co/jp/app/common/ApiResponse.java index 3bea82a..e31a684 100644 --- a/src/main/java/co/jp/app/common/ApiResponse.java +++ b/src/main/java/co/jp/app/common/ApiResponse.java @@ -1,6 +1,5 @@ package co.jp.app.common; -import co.jp.app.common.ResultCode; public class ApiResponse { private boolean success; 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 a912e8c..17bb6a1 100644 --- a/src/main/java/co/jp/app/config/security/SecurityConfig.java +++ b/src/main/java/co/jp/app/config/security/SecurityConfig.java @@ -1,7 +1,5 @@ package co.jp.app.config.security; -import co.jp.app.config.security.filter.JwtAuthenticationFilter; -import co.jp.app.service.UserService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; @@ -11,12 +9,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 { 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 7102e75..c29dded 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,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,12 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import co.jp.app.service.JwtService; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Component public class JwtAuthenticationFilter extends OncePerRequestFilter { diff --git a/src/main/java/co/jp/app/controller/DownloadController.java b/src/main/java/co/jp/app/controller/DownloadController.java index 6f1bdbf..a831ea5 100644 --- a/src/main/java/co/jp/app/controller/DownloadController.java +++ b/src/main/java/co/jp/app/controller/DownloadController.java @@ -3,21 +3,23 @@ package co.jp.app.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import co.jp.app.entity.PetEntity; import co.jp.app.service.PetService; -@Controller +@RestController public class DownloadController { @Autowired private PetService service; @GetMapping("/api/dogs/download") - public String downloadById(@RequestParam List id) { - service.getPetByID(id); - return "download"; + public ResponseEntity downloadById(@RequestParam List id) { + List list = service.getPetByID(id); + return ResponseEntity.ok(list); } } diff --git a/src/main/java/co/jp/app/controller/PetController.java b/src/main/java/co/jp/app/controller/PetController.java index 8be5908..486c625 100644 --- a/src/main/java/co/jp/app/controller/PetController.java +++ b/src/main/java/co/jp/app/controller/PetController.java @@ -3,13 +3,15 @@ package co.jp.app.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import co.jp.app.entity.PetEntity; import co.jp.app.service.PetService; -@Controller +@RestController public class PetController { @@ -17,8 +19,9 @@ public class PetController { private PetService service; @GetMapping("/api/dogs/pet") - public String getListByEntities(@RequestParam List id) { - service.getPetByID(id); - return "pet"; + public ResponseEntity getListByEntities(@RequestParam List id) { + + List list = service.getPetByID(id); + return ResponseEntity.ok(list); } } diff --git a/src/main/java/co/jp/app/controller/UploadController.java b/src/main/java/co/jp/app/controller/UploadController.java index 85c45e9..fda2f8e 100644 --- a/src/main/java/co/jp/app/controller/UploadController.java +++ b/src/main/java/co/jp/app/controller/UploadController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; @@ -19,12 +20,12 @@ public class UploadController { private UploadService service; @PostMapping("/api/dogs/upload") - public String upload() { + public ResponseEntity upload() { List list = new ArrayList(); - service.saveAllPets(list); + List pets = service.saveAllPets(list); - return "upload"; + return ResponseEntity.ok(pets); } diff --git a/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java b/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java index 0482aaf..4b34f1f 100644 --- a/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java +++ b/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 { diff --git a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties index f3135a6..8d2b1c9 100644 --- a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties +++ b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties @@ -1,6 +1,6 @@ #Generated by Maven Integration for Eclipse -#Mon May 12 15:57:02 JST 2025 -m2e.projectLocation=C\:\\Users\\Administrator\\git\\Dog-1 +#Wed May 14 11:48:45 JST 2025 +m2e.projectLocation=C\:\\Users\\ichbi\\OneDrive\\\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\\dog-1 m2e.projectName=dog-1 groupId=co.jp.app artifactId=dog-2 diff --git a/target/classes/co/jp/app/common/ApiResponse.class b/target/classes/co/jp/app/common/ApiResponse.class index 064e11b..9958624 100644 Binary files a/target/classes/co/jp/app/common/ApiResponse.class and b/target/classes/co/jp/app/common/ApiResponse.class differ diff --git a/target/classes/co/jp/app/config/security/SecurityConfig.class b/target/classes/co/jp/app/config/security/SecurityConfig.class index d5567d7..6c5a43c 100644 Binary files a/target/classes/co/jp/app/config/security/SecurityConfig.class and b/target/classes/co/jp/app/config/security/SecurityConfig.class differ diff --git a/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class b/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class index 4d41360..1227cc1 100644 Binary files a/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class and b/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class differ diff --git a/target/classes/co/jp/app/controller/DownloadController.class b/target/classes/co/jp/app/controller/DownloadController.class index 7c0199e..b70966f 100644 Binary files a/target/classes/co/jp/app/controller/DownloadController.class and b/target/classes/co/jp/app/controller/DownloadController.class differ diff --git a/target/classes/co/jp/app/controller/PetController.class b/target/classes/co/jp/app/controller/PetController.class index 3e8803f..d16f15b 100644 Binary files a/target/classes/co/jp/app/controller/PetController.class and b/target/classes/co/jp/app/controller/PetController.class differ diff --git a/target/classes/co/jp/app/controller/UserController.class b/target/classes/co/jp/app/controller/UserController.class index 6004553..f322e03 100644 Binary files a/target/classes/co/jp/app/controller/UserController.class and b/target/classes/co/jp/app/controller/UserController.class differ