From c3d391f656480e9edf3e062dffd3462927986bac Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Mon, 5 Aug 2024 17:08:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Refactor:=20=EC=9D=B8=EC=A6=9D=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EC=9C=A0=ED=9A=A8=EA=B8=B0=EA=B0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cmc/suppin/member/controller/MemberApi.java | 2 +- src/main/java/com/cmc/suppin/member/service/MemberService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cmc/suppin/member/controller/MemberApi.java b/src/main/java/com/cmc/suppin/member/controller/MemberApi.java index b9f4212..43b99b8 100644 --- a/src/main/java/com/cmc/suppin/member/controller/MemberApi.java +++ b/src/main/java/com/cmc/suppin/member/controller/MemberApi.java @@ -47,7 +47,7 @@ public ResponseEntity> requestEmailAuth(@RequestBody @Valid Me // 이메일 인증번호 확인(회원가입 시) @PostMapping("/join/email/verification") - @Operation(summary = "이메일 인증번호 확인 API", description = "request : email, verificationCode, response: 인증번호 일치 시 true, 불일치 시 false") + @Operation(summary = "이메일 인증번호 확인 API", description = "request : email, verificationCode(인증번호 유효기간은 5분입니다.), response: 인증번호 일치 시 true, 불일치 시 false") public ResponseEntity> verifyEmailCode(@RequestBody @Valid MemberRequestDTO.EmailVerificationDTO request) { memberService.verifyEmailCode(request.getEmail(), request.getVerificationCode()); return ResponseEntity.ok(ApiResponse.confirm(ResponseCode.CONFIRM)); diff --git a/src/main/java/com/cmc/suppin/member/service/MemberService.java b/src/main/java/com/cmc/suppin/member/service/MemberService.java index 44c0629..e8dde80 100644 --- a/src/main/java/com/cmc/suppin/member/service/MemberService.java +++ b/src/main/java/com/cmc/suppin/member/service/MemberService.java @@ -171,7 +171,7 @@ private void saveVerificationToken(String email, String code) { EmailVerificationToken verificationToken = EmailVerificationToken.builder() .email(email) .token(code) - .expiryDate(LocalDateTime.now().plusHours(1)) + .expiryDate(LocalDateTime.now().plusMinutes(5)) .build(); emailVerificationTokenRepository.deleteByEmail(email); From dc0b6a350316900f30342d9349263610936d6ad4 Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Mon, 5 Aug 2024 17:09:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Refactor:=20timezone=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cmc/suppin/global/config/MailConfig.java | 8 +++++--- src/main/resources/application.yml | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cmc/suppin/global/config/MailConfig.java b/src/main/java/com/cmc/suppin/global/config/MailConfig.java index 56ea75d..d82a995 100644 --- a/src/main/java/com/cmc/suppin/global/config/MailConfig.java +++ b/src/main/java/com/cmc/suppin/global/config/MailConfig.java @@ -8,7 +8,8 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; @Component @@ -26,8 +27,9 @@ public boolean sendMail(String toEmail, String code) { helper.setSubject("Suppin 인증번호"); // Format the current date and time - String formattedDateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd, HH:mm")); - + String formattedDateTime = ZonedDateTime.now(ZoneId.of("Asia/Seoul")) + .format(DateTimeFormatter.ofPattern("yyyy-MM-dd, HH:mm")); + // Use StringBuilder to construct the HTML email body StringBuilder emailBody = new StringBuilder(); emailBody.append("") diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1a2c453..b593742 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,8 @@ spring: server: port: 8080 + jackson: + time-zone: Asia/Seoul datasource: url: ${DB_URL} username: ${DB_USER}