diff --git a/src/main/java/com/example/hello_there/login/jwt/JwtProvider.java b/src/main/java/com/example/hello_there/login/jwt/JwtProvider.java index 0968a1d..d04c4a0 100644 --- a/src/main/java/com/example/hello_there/login/jwt/JwtProvider.java +++ b/src/main/java/com/example/hello_there/login/jwt/JwtProvider.java @@ -15,8 +15,8 @@ @Slf4j @Component public class JwtProvider { - private static final long REFRESH_TOKEN_EXPIRE_TIME = 1 * 24 * 60 * 60 * 1000L; //refreshToken 유효기간 1일 - private static final long ACCESS_TOKEN_EXPIRE_TIME = 1 * 60 * 60 * 1000L; //accessToken 유효기간 1시간 + private static final long REFRESH_TOKEN_EXPIRE_TIME = 3 * 24 * 60 * 60 * 1000L; //refreshToken 유효기간 3일 + private static final long ACCESS_TOKEN_EXPIRE_TIME = 12 * 60 * 60 * 1000L; //accessToken 유효기간 12시간 // private static final long REFRESH_TOKEN_EXPIRE_TIME = 60 * 1000L; //refreshToken 유효기간 1분, refrshToken 테스트를 위해 사용 // private static final long ACCESS_TOKEN_EXPIRE_TIME = 10 * 1000L; //유효기간 10초, refrshToken 테스트를 위해 사용 diff --git a/src/main/java/com/example/hello_there/notice/NoticeService.java b/src/main/java/com/example/hello_there/notice/NoticeService.java index 0cc4fa2..4031150 100644 --- a/src/main/java/com/example/hello_there/notice/NoticeService.java +++ b/src/main/java/com/example/hello_there/notice/NoticeService.java @@ -48,9 +48,9 @@ public PostNoticeRes sendCommentNotification(Long commentId) { createNotice(user, notice); // 알림 생성 및 저장 UserSetting userSetting = userSettingRepository.findByUserId(user.getId()); - if(userSetting.isCommentCheck()) { // 해당 알림에 대한 UserSetting이 true인 경우 - sendNotification(user, notice); // 푸시 알림 전송 - } +// if(userSetting.isCommentCheck()) { // 해당 알림에 대한 UserSetting이 true인 경우 +// sendNotification(user, notice); // 푸시 알림 전송 +// } return new PostNoticeRes(notice, comment.getBoard().getBoardType()); } @@ -72,9 +72,9 @@ public PostNoticeRes sendRecommentNotification(Long commentId) { createNotice(user, notice); UserSetting userSetting = userSettingRepository.findByUserId(user.getId()); - if(userSetting.isRecommentCheck()) { - sendNotification(user, notice); - } +// if(userSetting.isRecommentCheck()) { +// sendNotification(user, notice); +// } return new PostNoticeRes(notice, comment.getBoard().getBoardType()); } @@ -92,9 +92,9 @@ public PostNoticeRes sendBestBoardNotification(Long boardId) { createNotice(user, notice); UserSetting userSetting = userSettingRepository.findByUserId(user.getId()); - if(userSetting.isBestBoardCheck()) { - sendNotification(user, notice); - } +// if(userSetting.isBestBoardCheck()) { +// sendNotification(user, notice); +// } return new PostNoticeRes(notice, board.getBoardType()); } @@ -118,9 +118,9 @@ public PostNoticeRes sendMessageNotification(Long messageId) { for (User user : userList) { createNotice(user, notice); UserSetting userSetting = userSettingRepository.findByUserId(user.getId()); - if(userSetting.isMessageCheck()) { - sendNotification(user, notice); - } +// if(userSetting.isMessageCheck()) { +// sendNotification(user, notice); +// } } return new PostNoticeRes(notice, null); } diff --git a/src/main/java/com/example/hello_there/user/UserController.java b/src/main/java/com/example/hello_there/user/UserController.java index 1d032ca..d172f80 100644 --- a/src/main/java/com/example/hello_there/user/UserController.java +++ b/src/main/java/com/example/hello_there/user/UserController.java @@ -34,7 +34,7 @@ public class UserController { /** * ELB의 정상 동작을 확인하는 API */ - @GetMapping("/healthcheck") + @GetMapping("/health-check") public String healthcheck() { return "OK"; }