From 22ff4ec80f1105b804f7b3e5cff960dae5d07652 Mon Sep 17 00:00:00 2001 From: Jack <jack.su@pollex.com.tw> Date: 星期二, 11 一月 2022 17:04:17 +0800 Subject: [PATCH] [UPDATE] 更新預約單狀態新增新的狀態 [UPDATE] 取消預約時一併更新預約單的狀態為cancel [REF] 針對發送email和簡訊當設定檔為開發環境時不會實際連線 --- pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 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 6e4e286..8920b48 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 @@ -30,31 +30,31 @@ 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(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); - } +// 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