From c4f664ac6ff3060b82ae8d2108ed07bbc3cf9222 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 29 十二月 2021 12:31:04 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 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 4a47d67..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,23 +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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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 {
- @PostMapping("/bySMS")
- public ResponseEntity<Void> bySMS(@RequestBody Object param) {
+ private static final String NOTIFY_EMAIL_SUBJECT = "靽���像�蝟餌絞�嚗���";
+ @Autowired
+ SendMsgService sendMsgService;
+
+ @Autowired
+ AppointmentService appointmentService;
+
+ @Autowired
+ SpringTemplateEngine springTemplateEngine;
+
+ @GetMapping("/bySMS")
+ public ResponseEntity<SendSMSResponse> bySMS(@RequestParam String toMobile, @RequestParam String content) throws Exception {
+ return ResponseEntity.ok(sendMsgService.sendMsgBySMS(toMobile, content));
}
- @PostMapping("/byEmail")
- public ResponseEntity<Void> byEmail(@RequestBody Object param) {
+ @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));
+ }
+
+ 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