From e1906c2735766c6dbb2712047bf3d96701b3bd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EC=9B=90?= Date: Mon, 31 Mar 2025 23:14:19 +0900 Subject: [PATCH] update --- build.gradle | 5 +++++ .../java/com/petmatz/common/security/jwt/JwtManager.java | 8 +++++++- .../java/com/petmatz/domain/user/service/UserService.java | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 164e5fd..59565e8 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,11 @@ plugins { group = 'com' version = '0.0.1-SNAPSHOT' +jar { + archiveBaseName = 'petmatz' // JAR 파일 이름을 지정 + archiveVersion = '1.0.0' // 버전 지정 +} + java { toolchain { languageVersion = JavaLanguageVersion.of(17) diff --git a/src/main/java/com/petmatz/common/security/jwt/JwtManager.java b/src/main/java/com/petmatz/common/security/jwt/JwtManager.java index d7df9e8..12bd6b2 100644 --- a/src/main/java/com/petmatz/common/security/jwt/JwtManager.java +++ b/src/main/java/com/petmatz/common/security/jwt/JwtManager.java @@ -17,6 +17,8 @@ import java.nio.charset.StandardCharsets; import java.security.Key; import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.HashMap; @@ -68,7 +70,11 @@ public String createAccessToken(Long userId, String accountId) { } public String createRefreshToken(Long userId) { - Date expireDate = Date.from(Instant.now().plus(7 * 7, ChronoUnit.DAYS)); + Date expireDate = Date.from(LocalDateTime.now() + .plusWeeks(7) // 7주 추가 + .atZone(ZoneId.systemDefault()) + .toInstant()); + SecretKey secretKey = Keys.hmacShaKeyFor(refreshKey.getBytes(StandardCharsets.UTF_8)); String refreshToken = Jwts.builder() diff --git a/src/main/java/com/petmatz/domain/user/service/UserService.java b/src/main/java/com/petmatz/domain/user/service/UserService.java index 41aa8de..ab59f40 100644 --- a/src/main/java/com/petmatz/domain/user/service/UserService.java +++ b/src/main/java/com/petmatz/domain/user/service/UserService.java @@ -53,12 +53,13 @@ public void deleteId(DeleteIdRequestDto dto) { //sos보드 삭제 sosBoardDelete.deleteSosBoardByUser(userId); + //찜 목록 삭제 + //채팅방 삭제 // 명시적으로 Pet 삭제 // petRepository.deleteAll(pets); petRepository.deleteByUserId(userId); - userRepository.delete(user); }