diff --git a/src/main/java/com/cmc/suppin/event/crawl/service/CrawlService.java b/src/main/java/com/cmc/suppin/event/crawl/service/CrawlService.java index 6706393..4fa01be 100644 --- a/src/main/java/com/cmc/suppin/event/crawl/service/CrawlService.java +++ b/src/main/java/com/cmc/suppin/event/crawl/service/CrawlService.java @@ -19,6 +19,7 @@ import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.PageLoadStrategy; import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; @@ -98,6 +99,8 @@ public CrawlResponseDTO.CrawlResultDTO crawlYoutubeComments(String url, Long eve options.addArguments("--disable-infobars"); options.addArguments("--disable-browser-side-navigation"); options.addArguments("--disable-software-rasterizer"); + options.addArguments("--blink-settings=imagesEnabled=false"); // 이미지 로딩 비활성화 + options.setPageLoadStrategy(PageLoadStrategy.NORMAL); // 페이지 로드 전략 설정 WebDriver driver = new ChromeDriver(options); driver.get(url); diff --git a/src/main/java/com/cmc/suppin/event/survey/controller/dto/SurveyResponseDTO.java b/src/main/java/com/cmc/suppin/event/survey/controller/dto/SurveyResponseDTO.java index 46be5e2..bd64639 100644 --- a/src/main/java/com/cmc/suppin/event/survey/controller/dto/SurveyResponseDTO.java +++ b/src/main/java/com/cmc/suppin/event/survey/controller/dto/SurveyResponseDTO.java @@ -44,7 +44,16 @@ public static class QuestionDTO { private Long questionId; private QuestionType questionType; private String questionText; - private List options; + private List options; + + @Getter + @NoArgsConstructor + @AllArgsConstructor + @Builder + public static class OptionDTO { + private Long questionOptionId; + private String optionText; + } } @Getter diff --git a/src/main/java/com/cmc/suppin/event/survey/converter/SurveyConverter.java b/src/main/java/com/cmc/suppin/event/survey/converter/SurveyConverter.java index 3777914..f0cdd8a 100644 --- a/src/main/java/com/cmc/suppin/event/survey/converter/SurveyConverter.java +++ b/src/main/java/com/cmc/suppin/event/survey/converter/SurveyConverter.java @@ -60,7 +60,10 @@ public static SurveyResponseDTO.SurveyViewDTO toSurveyViewResultDTO(Survey surve .questionType(question.getQuestionType()) .questionText(question.getQuestionText()) .options(question.getQuestionOptionList().stream() - .map(QuestionOption::getOptionText) + .map(option -> SurveyResponseDTO.SurveyViewDTO.QuestionDTO.OptionDTO.builder() + .questionOptionId(option.getId()) + .optionText(option.getOptionText()) + .build()) .collect(Collectors.toList())) .build()) .collect(Collectors.toList()); 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 d82a995..d8ed64d 100644 --- a/src/main/java/com/cmc/suppin/global/config/MailConfig.java +++ b/src/main/java/com/cmc/suppin/global/config/MailConfig.java @@ -29,7 +29,7 @@ public boolean sendMail(String toEmail, String code) { // Format the current date and time 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("") @@ -42,13 +42,13 @@ public boolean sendMail(String toEmail, String code) { .append("") .append("
") .append("
") - .append("\"Suppin") + .append("\"Suppin") .append("

[Suppin] 인증번호를 안내해 드립니다.

") .append("
") .append("
") - .append("

안녕하세요, Suppin을 이용해주셔서 감사합니다 :)

") - .append("

Suppin 회원가입을 위해 인증번호를 안내해 드립니다. 아래 인증번호를 입력하여 이메일 인증을 완료해 주세요.

") - .append("
") + .append("

안녕하세요, Suppin을 이용해주셔서 감사합니다 :)

") + .append("

Suppin 회원가입을 위해 인증번호 안내 드립니다. 아래 인증번호를 5분 이내로 입력하여 이메일 인증을 완료해 주세요.

") + .append("
") // 인증번호 색상 .append(code) .append("
") .append("") @@ -73,7 +73,7 @@ public boolean sendMail(String toEmail, String code) { helper.setText(emailBody.toString(), true); // Add inline image - ClassPathResource logoImage = new ClassPathResource("static/images/suppin-logo.png"); + ClassPathResource logoImage = new ClassPathResource("static/images/suppin-logo2.png"); helper.addInline("suppinLogo", logoImage); javaMailSender.send(message); diff --git a/src/main/resources/static/images/suppin-logo2.png b/src/main/resources/static/images/suppin-logo2.png new file mode 100644 index 0000000..4b8c152 Binary files /dev/null and b/src/main/resources/static/images/suppin-logo2.png differ