diff --git a/build.gradle b/build.gradle index 2f142fd..e934835 100644 --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,9 @@ version = '0.0.1-SNAPSHOT' jar { archiveBaseName = 'petmatz' // JAR 파일 이름을 지정 - archiveVersion = '0.0.1' // 버전 지정 + 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); }