From 1d8e72674b2d14270fe5c2ba6fe3be4efa28a924 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期五, 24 十二月 2021 13:19:37 +0800
Subject: [PATCH] Merge branch 'master' of https://dev.pollex.com.tw:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 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..e1835e5 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,44 @@
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 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.*;
@Deprecated
@RestController
@RequestMapping("/api/test/sendMsg")
public class TestSendMsgResource {
- @PostMapping("/bySMS")
- public ResponseEntity<Void> bySMS(@RequestBody Object param) {
+ @Autowired
+ SendMsgService sendMsgService;
+ @Autowired
+ AppointmentRepository appointmentRepository;
+
+ @GetMapping("/bySMS")
+ public ResponseEntity<SendSMSResponse> bySMS(@RequestParam String toMobile, @RequestParam String content) {
+ 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(sendMsgService.sendMsgByHtmlTestTemplateEmail(from, to));
}
}
--
Gitblit v1.8.0