From 1bbc6a99362e91d8439fe1955d879639f3524af1 Mon Sep 17 00:00:00 2001
From: yxhwxn <officeyh9819@gmail.com>
Date: Sun, 4 Aug 2024 02:26:14 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20=EC=9D=91=EB=8B=B5=20=EC=8B=9C=EA=B0=84?=
 =?UTF-8?q?=20=ED=8F=AC=EB=A7=B7=20=EB=B0=8F=20emailBody=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

---
 .../cmc/suppin/global/config/MailConfig.java  | 80 +++++++++++--------
 1 file changed, 46 insertions(+), 34 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 32c8dc2..56ea75d 100644
--- a/src/main/java/com/cmc/suppin/global/config/MailConfig.java
+++ b/src/main/java/com/cmc/suppin/global/config/MailConfig.java
@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 @Component
 @RequiredArgsConstructor
@@ -24,41 +25,50 @@ public boolean sendMail(String toEmail, String code) {
             helper.setTo(toEmail);
             helper.setSubject("Suppin 인증번호");
 
-            String emailBody = String.format(
-                    "<!DOCTYPE html>" +
-                            "<html lang=\"en\">" +
-                            "<head>" +
-                            "<meta charset=\"UTF-8\">" +
-                            "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">" +
-                            "<title>Suppin Email Verification</title>" +
-                            "</head>" +
-                            "<body style=\"font-family: Arial, sans-serif;\">" +
-                            "<div style=\"padding: 20px; border: 1px solid #eaeaea; max-width: 600px; margin: 0 auto;\">" +
-                            "<div style=\"padding: 20px; border-bottom: 1px solid #eaeaea; text-align: center;\">" +
-                            "<img src=\"cid:suppinLogo\" alt=\"Suppin Logo\" style=\"width: 100px;\">" +
-                            "<h2 style=\"color: #333;\"><span style=\"color: #1a73e8;\">[Suppin]</span> 인증번호를 안내해 드립니다.</h2>" +
-                            "</div>" +
-                            "<div style=\"padding: 20px;\">" +
-                            "<p>안녕하세요, Suppin을 이용해주셔서 감사합니다 :)</p>" +
-                            "<p>Suppin 회원가입을 위해 인증번호를 안내해 드립니다. 아래 인증번호를 입력하여 이메일 인증을 완료해 주세요.</p>" +
-                            String.format("<div style=\"font-size: 24px; font-weight: bold; margin: 20px 0; color: #333; text-align: center;\">%s</div>", code) +
-                            "<table style=\"width: 100%; border-collapse: collapse;\">" +
-                            "<tbody>" +
-                            "<tr><td style=\"padding: 10px; border: 1px solid #eaeaea;\">인증 번호</td><td style=\"padding: 10px; border: 1px solid #eaeaea;\">" + code + "</td></tr>" +
-                            "<tr><td style=\"padding: 10px; border: 1px solid #eaeaea;\">요청 일시</td><td style=\"padding: 10px; border: 1px solid #eaeaea;\">" + LocalDateTime.now().toString() + "</td></tr>" +
-                            "</tbody>" +
-                            "</table>" +
-                            "</div>" +
-                            "<div style=\"padding: 20px; border-top: 1px solid #eaeaea; text-align: center; color: #999;\">" +
-                            "<p>감사합니다.</p>" +
-                            "<p style=\"font-size: 12px;\">※ 본 메일은 Suppin 서비스 이용에 관한 안내 메일입니다.</p>" +
-                            "</div>" +
-                            "</div>" +
-                            "</body>" +
-                            "</html>"
-            );
+            // Format the current date and time
+            String formattedDateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd, HH:mm"));
 
-            helper.setText(emailBody, true);
+            // Use StringBuilder to construct the HTML email body
+            StringBuilder emailBody = new StringBuilder();
+            emailBody.append("<!DOCTYPE html>")
+                    .append("<html lang=\"en\">")
+                    .append("<head>")
+                    .append("<meta charset=\"UTF-8\">")
+                    .append("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">")
+                    .append("<title>Suppin Email Verification</title>")
+                    .append("</head>")
+                    .append("<body style=\"font-family: Arial, sans-serif;\">")
+                    .append("<div style=\"padding: 20px; border: 1px solid #eaeaea; max-width: 600px; margin: 0 auto;\">")
+                    .append("<div style=\"padding: 20px; border-bottom: 1px solid #eaeaea; text-align: center;\">")
+                    .append("<img src=\"cid:suppinLogo\" alt=\"Suppin Logo\" style=\"width: 100px;\">")
+                    .append("<h2 style=\"color: #333;\"><span style=\"color: #1a73e8;\">[Suppin]</span> 인증번호를 안내해 드립니다.</h2>")
+                    .append("</div>")
+                    .append("<div style=\"padding: 20px;\">")
+                    .append("<p>안녕하세요, Suppin을 이용해주셔서 감사합니다 :)</p>")
+                    .append("<p>Suppin 회원가입을 위해 인증번호를 안내해 드립니다. 아래 인증번호를 입력하여 이메일 인증을 완료해 주세요.</p>")
+                    .append("<div style=\"font-size: 24px; font-weight: bold; margin: 20px 0; color: #333; text-align: center;\">")
+                    .append(code)
+                    .append("</div>")
+                    .append("<table style=\"width: 100%; border-collapse: collapse;\">")
+                    .append("<tbody>")
+                    .append("<tr><td style=\"padding: 10px; border: 1px solid #eaeaea;\">인증 번호</td><td style=\"padding: 10px; border: 1px solid #eaeaea;\">")
+                    .append(code)
+                    .append("</td></tr>")
+                    .append("<tr><td style=\"padding: 10px; border: 1px solid #eaeaea;\">요청 일시</td><td style=\"padding: 10px; border: 1px solid #eaeaea;\">")
+                    .append(formattedDateTime)
+                    .append("</td></tr>")
+                    .append("</tbody>")
+                    .append("</table>")
+                    .append("</div>")
+                    .append("<div style=\"padding: 20px; border-top: 1px solid #eaeaea; text-align: center; color: #999;\">")
+                    .append("<p>감사합니다.</p>")
+                    .append("<p style=\"font-size: 12px;\">※ 본 메일은 Suppin 서비스 이용에 관한 안내 메일입니다.</p>")
+                    .append("</div>")
+                    .append("</div>")
+                    .append("</body>")
+                    .append("</html>");
+
+            helper.setText(emailBody.toString(), true);
 
             // Add inline image
             ClassPathResource logoImage = new ClassPathResource("static/images/suppin-logo.png");
@@ -74,3 +84,5 @@ public boolean sendMail(String toEmail, String code) {
 }
 
 
+
+

인증 번호	" + code + "
요청 일시	" + LocalDateTime.now().toString() + "
인증 번호	") + .append(code) + .append("
요청 일시	") + .append(formattedDateTime) + .append("