admin/ocr-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.byeori.cloud/admin/ocr-java

Browse Source 
pull merge
This commit is contained in:
root
2026-03-25 23:20:05 +09:00
parent d8af2f71c6 fee9b12395
commit 8fe6a32ede
6 changed files with 78 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
prd/src/main/java/site/ocr/prd/SecurityConfig.java → prd/src/main/java/site/ocr/prd/config/SecurityConfig.java
View File

@@ -1,4 +1,4 @@
package site.ocr.prd;
package site.ocr.prd.config;
import java.util.List;
@@ -33,4 +33,4 @@ public class SecurityConfig {
return http.build();
}
}
}

4
prd/src/main/java/site/ocr/prd/WebClientConfig.java → prd/src/main/java/site/ocr/prd/config/WebClientConfig.java
View File

@@ -1,4 +1,4 @@
package site.ocr.prd;
package site.ocr.prd.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -18,4 +18,4 @@ public class WebClientConfig {
public RestTemplate restTemplate() {
return new RestTemplate();
}
}
}

4
prd/src/main/java/site/ocr/prd/WebMVCConfig.java → prd/src/main/java/site/ocr/prd/config/WebMVCConfig.java
View File

@@ -1,10 +1,12 @@
package site.ocr.prd;
package site.ocr.prd.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import site.ocr.prd.SessionLoggingInterceptor;
@Configuration
public class WebMVCConfig implements WebMvcConfigurer {

2
prd/src/main/java/site/ocr/prd/contorllers/ImgController.java
View File

@@ -41,7 +41,7 @@ public class ImgController {
//요청 전송
ResponseEntity<String> response =
restTemplate.postForEntity("http://localhost:9002/ocr",
restTemplate.postForEntity("http://127.0.0.1:9002/ocr",
requestEntity, String.class);
return ResponseEntity.ok(response.getBody());

66
prd/src/main/java/site/ocr/prd/contorllers/LoginController.java
View File

@@ -1,16 +1,17 @@
package site.ocr.prd.contorllers;
import java.time.Duration;
import java.util.Map;
import org.slf4j.Logger;
import java.util.HashMap;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseCookie;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.reactive.function.client.WebClient;
import jakarta.servlet.http.HttpServletRequest;
import site.ocr.prd.components.JwtProvider;
import site.ocr.prd.dto.LoginReqDTO;
import site.ocr.prd.dto.LoginResDTO;
import site.ocr.prd.dto.UserInfoInqyReqDTO;
@@ -25,22 +26,23 @@ import org.springframework.web.bind.annotation.RequestParam;
@Controller
public class LoginController {
//service 선언
private LoginService loginService = new LoginService(WebClient.builder());
//JWT 선언
private final JwtProvider jwtProvider;
//Logger 선언
private static final Logger logger = LoggerFactory.getLogger(LoginController.class);
public LoginController(JwtProvider provider) {
this.jwtProvider = provider;
//service 선언
private final LoginService loginService;
public LoginController(LoginService loginService) {
this.loginService = loginService;
}
/**
* 프론트에서 카카오로 로그인 요청 후 카카오에서 리다이렉트 해준 인가코드로 토큰 발급 및 사용자정보 조회
* @param redirectRespn 카카오에서 리다이렉트해준 인가코드
*/
@GetMapping("/oauth/oauth-kakao-authorize") //kakao에서 get으로 리다이렉트 해줌
public ResponseEntity kakaoLoginRequestDto(HttpServletRequest redirectRespn) {
public ResponseEntity<Map<String, String>> kakaoLoginRequest(HttpServletRequest redirectRespn) {
String code = redirectRespn.getParameter("code");
System.out.println("인가코드 :: " + code);
logger.info("인가코드 :: " + code);
/**
* 카카오에 토큰값 요청
@@ -62,7 +64,7 @@ public class LoginController {
* @param refresh_token 사용자 리프레시 토큰
*/
LoginResDTO loginResult = loginService.getToken(loginRequest);
System.out.println("결과 :: " + loginResult.toString());
logger.info("토큰발급 결과 :: " + loginResult.toString());
UserInfoInqyReqDTO userInfoInqyRequest = new UserInfoInqyReqDTO();
userInfoInqyRequest.setAccess_token(loginResult.getAccess_token());
@@ -72,25 +74,35 @@ public class LoginController {
* @param access_token 사용자정보 조회용 토큰
*/
UserInfoInqyResDTO userInfoInqyResponse = loginService.getUserInfo(userInfoInqyRequest);
System.out.println("사용자정보 :: " + userInfoInqyResponse.toString());
logger.info("사용자정보 :: " + userInfoInqyResponse.toString());
/**
* jwt 생성
* oauth를 통해 받은 토큰을 직접 사용하지 말고 id에 jwt키를 발급해서 사용
* cookie에 저장
*/
String jwt = jwtProvider.createJwtToken(userInfoInqyResponse.getId());
ResponseCookie cookie = ResponseCookie.from("accessToken", jwt)
.httpOnly(true)
.secure(true)
.sameSite("Lax")
.maxAge(Duration.ofHours(1))
.build();
ResponseCookie cookie = loginService.createJwtCookie(userInfoInqyResponse.getId());
Map<String, String> response = new HashMap<>();
response.put("success", "true");
response.put("userId", userInfoInqyResponse.getId());
response.put("message", "Login successful");
response.put("userInfo", userInfoInqyResponse.getName());
return ResponseEntity.status(302)
.header(HttpHeaders.SET_COOKIE, cookie.toString())
.header(HttpHeaders.LOCATION, "http://localhost:3000/main")
.build();
.header(HttpHeaders.LOCATION, "http://localhost:3000/pages/oauth/callback")
.body(response);
}
/**
* JWT 토큰 조회 (프론트에서 로그인 상태 확인용)
* @param userId 사용자 ID
* @return 로그인 결과 및 JWT 토큰
*/
@GetMapping("/oauth/get-jwt-token")
public ResponseEntity<Map<String, String>> getJwtToken(@RequestParam String userId) {
ResponseCookie cookie = loginService.createJwtCookie(userId);
Map<String, String> response = new java.util.HashMap<>();
response.put("token", cookie.toString());
return ResponseEntity.ok()
.header(HttpHeaders.SET_COOKIE, cookie.toString())
.body(response);
}
@GetMapping("login/oauth-kakao-token")

37
prd/src/main/java/site/ocr/prd/services/LoginService.java
View File

@@ -1,13 +1,19 @@
package site.ocr.prd.services;
import java.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseCookie;
import org.springframework.stereotype.Service;
import org.springframework.web.reactive.function.BodyInserters;
import org.springframework.web.reactive.function.client.WebClient;
import com.fasterxml.jackson.databind.JsonNode;
import site.ocr.prd.components.JwtProvider;
import site.ocr.prd.dto.LoginReqDTO;
import site.ocr.prd.dto.LoginResDTO;
import site.ocr.prd.dto.UserInfoInqyReqDTO;
@@ -16,17 +22,21 @@ import site.ocr.prd.dto.UserInfoInqyResDTO;
@Service
public class LoginService {
//logger 선언
private static final Logger logger = LoggerFactory.getLogger(LoginService.class);
//webclient builder
private final WebClient webClient;
//JWT provider
private final JwtProvider jwtProvider;
public LoginService(WebClient.Builder builder) {
public LoginService(WebClient.Builder builder, JwtProvider jwtProvider) {
this.webClient = builder.build();
this.jwtProvider = jwtProvider;
}
public LoginResDTO getToken(LoginReqDTO request) {
System.out.println("kakao auth code = {}" + request.getCode());
logger.info("kakao auth code :: " + request.getCode());
LoginResDTO result = webClient.post()
.uri("https://kauth.kakao.com/oauth/token")
@@ -54,15 +64,30 @@ public class LoginService {
.block();
//사용자ID
//jsonnode :: {"id":4438121341,"connected_at":"2025-09-09T03:53:23Z"}
logger.info("jsonnode :: " + root.toString());
String id = root.path("id").asText();
String name = root.path("name").asText();
String email = root.path("email").asText();
//jsonnode :: {"id":4438121341,"connected_at":"2025-09-09T03:53:23Z"}
System.out.println("jsonnode :: " + root.toString());
result.setId(id);
result.setName(name);
result.setEmail(email);
return result;
}
/**
* JWT 토큰을 생성하고 ResponseCookie로 변환
* @param userId 사용자 ID
* @return ResponseCookie JWT 토큰이 포함된 쿠키
*/
public ResponseCookie createJwtCookie(String userId) {
String jwt = jwtProvider.createJwtToken(userId);
return ResponseCookie.from("accessToken", jwt)
.httpOnly(true)
.secure(true)
.sameSite("Lax")
.maxAge(Duration.ofHours(1))
.build();
}
}