From ac594e4efb30ba28776d74b0fb08ab34d7c32023 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 30 十二月 2021 15:20:08 +0800
Subject: [PATCH] Merge branch 'Phase2'
---
pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 ab40016..6e4e286 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,33 +1,60 @@
package com.pollex.pam.web.rest;
+import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.SendMsgService;
+import com.pollex.pam.service.dto.SendSMSResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import org.thymeleaf.context.Context;
+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
+ AppointmentService appointmentService;
+
+ @Autowired
+ SpringTemplateEngine springTemplateEngine;
+
@GetMapping("/bySMS")
- public ResponseEntity<Void> bySMS(@RequestParam String subject, @RequestParam String toMobile, @RequestParam String content) {
- sendMsgService.sendMsgBySMS(subject, toMobile, content);
- return ResponseEntity.noContent().build();
+ public ResponseEntity<SendSMSResponse> bySMS(@RequestParam String toMobile, @RequestParam String content) throws Exception {
+ return ResponseEntity.ok(sendMsgService.sendMsgBySMS(toMobile, content));
}
@GetMapping("/byEmail")
- public ResponseEntity<Void> byEmail(
+ public ResponseEntity<String> byEmail(
@RequestParam String from,
@RequestParam String to,
@RequestParam String subject,
@RequestParam String content,
@RequestParam boolean htmlFormat
) {
- sendMsgService.sendMsgByEmail(from, to, subject, content, htmlFormat);
- return ResponseEntity.noContent().build();
+ 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));
+ }
+
+ 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