From b832880e1fcf3307387d53106078498f68a95853 Mon Sep 17 00:00:00 2001 From: jack <jack.su@pollex.com.tw> Date: 星期二, 05 三月 2024 16:59:02 +0800 Subject: [PATCH] 移除TestLoginResource --- pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java | 59 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 22 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java index e1835e5..f001429 100644 --- a/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java +++ b/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java @@ -1,44 +1,59 @@ package com.pollex.pam.web.rest; -import com.pollex.pam.repository.AppointmentRepository; -import com.pollex.pam.service.SendMsgService; -import com.pollex.pam.service.dto.SendSMSResponse; +import com.pollex.pam.business.service.AppointmentService; +import com.pollex.pam.business.service.SendMsgService; +import com.pollex.pam.business.service.dto.SendSMSResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.thymeleaf.spring5.SpringTemplateEngine; @Deprecated @RestController @RequestMapping("/api/test/sendMsg") public class TestSendMsgResource { + private static final String NOTIFY_EMAIL_SUBJECT = "靽���像�蝟餌絞�嚗���"; + @Autowired SendMsgService sendMsgService; @Autowired - AppointmentRepository appointmentRepository; + AppointmentService appointmentService; + + @Autowired + SpringTemplateEngine springTemplateEngine; @GetMapping("/bySMS") - public ResponseEntity<SendSMSResponse> bySMS(@RequestParam String toMobile, @RequestParam String content) { + public ResponseEntity<SendSMSResponse> bySMS(@RequestParam String toMobile, @RequestParam String content) throws Exception { return ResponseEntity.ok(sendMsgService.sendMsgBySMS(toMobile, content)); } - @GetMapping("/byEmail") - public ResponseEntity<String> byEmail( - @RequestParam String from, - @RequestParam String to, - @RequestParam String subject, - @RequestParam String content, - @RequestParam boolean htmlFormat - ) { - return ResponseEntity.ok(sendMsgService.sendMsgByEmail(from, to, subject, content, htmlFormat)); - } +// @GetMapping("/byEmail") +// public ResponseEntity<String> byEmail( +// @RequestParam String from, +// @RequestParam String to, +// @RequestParam String subject, +// @RequestParam String content, +// @RequestParam boolean htmlFormat +// ) { +// return ResponseEntity.ok(sendMsgService.sendMsgByEmail(from, to, subject, content, htmlFormat)); +// } +// +// @GetMapping("/byHtmlEmail") +// public ResponseEntity<String> byHtmlEmail( +// @RequestParam String from, +// @RequestParam String to +// ) { +// return ResponseEntity.ok(testSendMsgByHtmlTemplateEmail(from, to)); +// } - @GetMapping("/byHtmlEmail") - public ResponseEntity<String> byHtmlEmail( - @RequestParam String from, - @RequestParam String to - ) { - return ResponseEntity.ok(sendMsgService.sendMsgByHtmlTestTemplateEmail(from, to)); - } +// private String testSendMsgByHtmlTemplateEmail(String from, String to) { +// Context context = new Context(); +// context.setVariable("content", "閬芣��“��憟踝����蝑�靽���像������\n"); +// context.setVariable("urlHint", appointmentService.getAppointmentDetailUrl(0L)); +// +// String content = springTemplateEngine.process("mail/appointmentNotifyEmail", context); +// return sendMsgService.sendMsgByEmail(from, to, NOTIFY_EMAIL_SUBJECT, content, true); +// } } -- Gitblit v1.8.0