From 9538de67f071a0403030e3ed7053d0726e0c3e7b Mon Sep 17 00:00:00 2001 From: StoneCAU Date: Thu, 20 Feb 2025 22:14:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20BigCategory=20enum=20=EA=B0=92=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/umc/catchy/domain/category/domain/BigCategory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/umc/catchy/domain/category/domain/BigCategory.java b/src/main/java/umc/catchy/domain/category/domain/BigCategory.java index 0126ef62..30202d04 100644 --- a/src/main/java/umc/catchy/domain/category/domain/BigCategory.java +++ b/src/main/java/umc/catchy/domain/category/domain/BigCategory.java @@ -13,9 +13,9 @@ public enum BigCategory { BAR("주류"), RESTAURANT("음식점"), EXPERIENCE("체험"), - CULTURE("문화생활"), - SPORTS("스포츠"), - WELLNESS("휴식/웰니스"); + CULTURELIFE("문화생활"), + SPORT("스포츠"), + REST("휴식"); private final String value; From f0a2d8155e3daf71da1965b4c530e6bc9ff9fa74 Mon Sep 17 00:00:00 2001 From: StoneCAU Date: Fri, 21 Feb 2025 01:20:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20reissue=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/umc/catchy/domain/member/service/MemberService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/umc/catchy/domain/member/service/MemberService.java b/src/main/java/umc/catchy/domain/member/service/MemberService.java index 16c2f3c7..6e1e4ea1 100644 --- a/src/main/java/umc/catchy/domain/member/service/MemberService.java +++ b/src/main/java/umc/catchy/domain/member/service/MemberService.java @@ -261,17 +261,14 @@ public ReIssueTokenResponse validateRefreshToken() { Member member = memberRepository.findByEmail(email) .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); String originAccessToken = member.getAccessToken(); - long expirationTime = jwtUtil.getExpirationTime(originAccessToken).getTime() - System.currentTimeMillis(); - blackTokenRedisService.addBlacklistedToken(originAccessToken, expirationTime); redisTokenService.deleteRefreshToken(refreshToken); // 토큰 재발급 String newRefreshToken = jwtUtil.createRefreshToken(email); - String newAccessToken = jwtUtil.createAccessToken(refreshToken); redisTokenService.addRefreshToken(newRefreshToken); - return ReIssueTokenResponse.of(newAccessToken, newRefreshToken); + return ReIssueTokenResponse.of(originAccessToken, newRefreshToken); } // 리프레시 토큰이 만료되었을 때 else throw new GeneralException(ErrorStatus.TOKEN_EXPIRED);