CONTROLLER變更
This commit is contained in:
@ -1,6 +1,5 @@
|
|||||||
package co.jp.app.common;
|
package co.jp.app.common;
|
||||||
|
|
||||||
import co.jp.app.common.ResultCode;
|
|
||||||
|
|
||||||
public class ApiResponse<T> {
|
public class ApiResponse<T> {
|
||||||
private boolean success;
|
private boolean success;
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
package co.jp.app.config.security;
|
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.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Lazy;
|
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.authentication.configuration.AuthenticationConfiguration;
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||||
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
|
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.core.userdetails.UserDetailsService;
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.security.web.SecurityFilterChain;
|
import org.springframework.security.web.SecurityFilterChain;
|
||||||
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
|
|
||||||
|
import co.jp.app.config.security.filter.JwtAuthenticationFilter;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class SecurityConfig {
|
public class SecurityConfig {
|
||||||
|
@ -1,12 +1,7 @@
|
|||||||
package co.jp.app.config.security.filter;
|
package co.jp.app.config.security.filter;
|
||||||
|
|
||||||
import co.jp.app.service.JwtService;
|
|
||||||
import java.io.IOException;
|
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.lang.NonNull;
|
||||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
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.stereotype.Component;
|
||||||
import org.springframework.web.filter.OncePerRequestFilter;
|
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
|
@Component
|
||||||
public class JwtAuthenticationFilter extends OncePerRequestFilter {
|
public class JwtAuthenticationFilter extends OncePerRequestFilter {
|
||||||
|
@ -3,21 +3,23 @@ package co.jp.app.controller;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
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;
|
import co.jp.app.service.PetService;
|
||||||
|
|
||||||
@Controller
|
@RestController
|
||||||
public class DownloadController {
|
public class DownloadController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private PetService service;
|
private PetService service;
|
||||||
|
|
||||||
@GetMapping("/api/dogs/download")
|
@GetMapping("/api/dogs/download")
|
||||||
public String downloadById(@RequestParam List<Integer> id) {
|
public ResponseEntity<?> downloadById(@RequestParam List<Integer> id) {
|
||||||
service.getPetByID(id);
|
List<PetEntity> list = service.getPetByID(id);
|
||||||
return "download";
|
return ResponseEntity.ok(list);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,13 +3,15 @@ package co.jp.app.controller;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
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;
|
import co.jp.app.service.PetService;
|
||||||
|
|
||||||
@Controller
|
@RestController
|
||||||
|
|
||||||
public class PetController {
|
public class PetController {
|
||||||
|
|
||||||
@ -17,8 +19,9 @@ public class PetController {
|
|||||||
private PetService service;
|
private PetService service;
|
||||||
|
|
||||||
@GetMapping("/api/dogs/pet")
|
@GetMapping("/api/dogs/pet")
|
||||||
public String getListByEntities(@RequestParam List<Integer> id) {
|
public ResponseEntity<?> getListByEntities(@RequestParam List<Integer> id) {
|
||||||
service.getPetByID(id);
|
|
||||||
return "pet";
|
List<PetEntity> list = service.getPetByID(id);
|
||||||
|
return ResponseEntity.ok(list);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.CrossOrigin;
|
import org.springframework.web.bind.annotation.CrossOrigin;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
@ -19,12 +20,12 @@ public class UploadController {
|
|||||||
private UploadService service;
|
private UploadService service;
|
||||||
|
|
||||||
@PostMapping("/api/dogs/upload")
|
@PostMapping("/api/dogs/upload")
|
||||||
public String upload() {
|
public ResponseEntity<?> upload() {
|
||||||
List<PetEntity> list = new ArrayList<PetEntity>();
|
List<PetEntity> list = new ArrayList<PetEntity>();
|
||||||
|
|
||||||
service.saveAllPets(list);
|
List<PetEntity> pets = service.saveAllPets(list);
|
||||||
|
|
||||||
return "upload";
|
return ResponseEntity.ok(pets);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,14 +1,11 @@
|
|||||||
package co.jp.app.exception;
|
package co.jp.app.exception;
|
||||||
|
|
||||||
import co.jp.app.common.ApiResponse;
|
import java.util.stream.Collectors;
|
||||||
import co.jp.app.common.ResultCode;
|
|
||||||
import co.jp.app.exception.BusinessException;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.security.access.AccessDeniedException;
|
|
||||||
import org.springframework.security.authentication.BadCredentialsException;
|
import org.springframework.security.authentication.BadCredentialsException;
|
||||||
import org.springframework.security.core.AuthenticationException;
|
import org.springframework.security.core.AuthenticationException;
|
||||||
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
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.ExceptionHandler;
|
||||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
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
|
@RestControllerAdvice
|
||||||
public class GlobalExceptionHandler {
|
public class GlobalExceptionHandler {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#Generated by Maven Integration for Eclipse
|
#Generated by Maven Integration for Eclipse
|
||||||
#Mon May 12 15:57:02 JST 2025
|
#Wed May 14 11:48:45 JST 2025
|
||||||
m2e.projectLocation=C\:\\Users\\Administrator\\git\\Dog-1
|
m2e.projectLocation=C\:\\Users\\ichbi\\OneDrive\\\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\\dog-1
|
||||||
m2e.projectName=dog-1
|
m2e.projectName=dog-1
|
||||||
groupId=co.jp.app
|
groupId=co.jp.app
|
||||||
artifactId=dog-2
|
artifactId=dog-2
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user