From 52f4ea5e6bb33546802a6069b344a64632db61cc Mon Sep 17 00:00:00 2001 From: 1223v <1223v@naver.com> Date: Tue, 21 May 2024 02:05:53 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20Progress=20INTEGRATION=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/readyvery/readyverydemo/config/RedisConfig.java | 4 +--- .../java/com/readyvery/readyverydemo/domain/Progress.java | 4 +++- .../jwt/filter/JwtAuthenticationProcessingFilter.java | 2 +- .../readyverydemo/security/jwt/service/JwtServiceImpl.java | 6 +++--- .../security/oauth2/handler/OAuth2LoginFailureHandler.java | 2 +- .../readyvery/readyverydemo/src/user/UserServiceImpl.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/readyvery/readyverydemo/config/RedisConfig.java b/src/main/java/com/readyvery/readyverydemo/config/RedisConfig.java index 74b75c1..5176331 100644 --- a/src/main/java/com/readyvery/readyverydemo/config/RedisConfig.java +++ b/src/main/java/com/readyvery/readyverydemo/config/RedisConfig.java @@ -21,9 +21,7 @@ public class RedisConfig { @Bean public RedisConnectionFactory redisConnectionFactory() { - LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(host, port); - log.info("RedisConfig.redisConnectionFactory() called" + lettuceConnectionFactory); - return lettuceConnectionFactory; + return new LettuceConnectionFactory(host, port); } } diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Progress.java b/src/main/java/com/readyvery/readyverydemo/domain/Progress.java index 432bcfb..f4d9192 100644 --- a/src/main/java/com/readyvery/readyverydemo/domain/Progress.java +++ b/src/main/java/com/readyvery/readyverydemo/domain/Progress.java @@ -12,8 +12,10 @@ public enum Progress { MAKE("MAKE", "음식 제조 중"), COMPLETE("COMPLETE", "제조 완료"), PICKUP("PICKUP", "픽업 완료"), - FAIL("FAIL", "주문 실패"); + FAIL("FAIL", "주문 실패"), + INTEGRATION("INTEGRATION", "통합 주문"); private final String key; private final String value; } + diff --git a/src/main/java/com/readyvery/readyverydemo/security/jwt/filter/JwtAuthenticationProcessingFilter.java b/src/main/java/com/readyvery/readyverydemo/security/jwt/filter/JwtAuthenticationProcessingFilter.java index ce92412..1e3a70b 100644 --- a/src/main/java/com/readyvery/readyverydemo/security/jwt/filter/JwtAuthenticationProcessingFilter.java +++ b/src/main/java/com/readyvery/readyverydemo/security/jwt/filter/JwtAuthenticationProcessingFilter.java @@ -57,7 +57,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse // RefreshToken까지 보낸 것이므로 리프레시 토큰이 DB의 리프레시 토큰과 일치하는지 판단 후, // 일치한다면 AccessToken을 재발급해준다. if (refreshToken != null) { - log.info("refreshToken이 존재합니다."); + checkRefreshTokenAndReIssueAccessToken(response, refreshToken); return; // RefreshToken을 보낸 경우에는 AccessToken을 재발급 하고 인증 처리는 하지 않게 하기위해 바로 return으로 필터 진행 막기 } diff --git a/src/main/java/com/readyvery/readyverydemo/security/jwt/service/JwtServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/security/jwt/service/JwtServiceImpl.java index 9eadcf8..78c04c6 100644 --- a/src/main/java/com/readyvery/readyverydemo/security/jwt/service/JwtServiceImpl.java +++ b/src/main/java/com/readyvery/readyverydemo/security/jwt/service/JwtServiceImpl.java @@ -62,7 +62,7 @@ public void sendAccessAndRefreshToken(HttpServletResponse response, String acces jwtTokenizer.addAccessTokenCookie(response, accessToken); jwtTokenizer.addRefreshTokenCookie(response, refreshToken); - log.info("Access Token, Refresh Token 헤더 설정 완료"); + } /** @@ -104,7 +104,7 @@ public Optional extractEmail(String accessToken) { return jwtTokenizer.verifyAccessToken(accessToken); } catch (Exception e) { - log.error("액세스 토큰이 유효하지 않습니다."); + return Optional.empty(); } } @@ -115,7 +115,7 @@ public boolean isTokenValid(String token) { JWT.require(jwtConfig.getAlgorithm()).build().verify(token); return true; } catch (Exception e) { - log.error("유효하지 않은 토큰입니다. {}", e.getMessage()); + return false; } } diff --git a/src/main/java/com/readyvery/readyverydemo/security/oauth2/handler/OAuth2LoginFailureHandler.java b/src/main/java/com/readyvery/readyverydemo/security/oauth2/handler/OAuth2LoginFailureHandler.java index dd747ff..e1e5964 100644 --- a/src/main/java/com/readyvery/readyverydemo/security/oauth2/handler/OAuth2LoginFailureHandler.java +++ b/src/main/java/com/readyvery/readyverydemo/security/oauth2/handler/OAuth2LoginFailureHandler.java @@ -20,7 +20,7 @@ public void onAuthenticationFailure(HttpServletRequest request, HttpServletRespo ServletException { response.setStatus(HttpServletResponse.SC_BAD_REQUEST); response.getWriter().write("소셜 로그인 실패! 서버 로그를 확인해주세요."); - log.info("소셜 로그인에 실패했습니다. 에러 메시지 : {}", exception.getMessage()); + } } diff --git a/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java index d726492..acf4ff8 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java +++ b/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java @@ -126,7 +126,7 @@ private String requestToServer(String headerStr, String postData) throws IOExcep responseCode == 200 ? connectReq.getInputStream() : connectReq.getErrorStream()))) { String inputLine; StringBuilder response = new StringBuilder(); - log.info("responseCode: {}", responseCode); + while ((inputLine = br.readLine()) != null) { response.append(inputLine); }