From 073f149c57f79d61bf605c9d38e332259b49d96d Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期六, 22 一月 2022 14:56:05 +0800
Subject: [PATCH] Merge branch '未處理預約單API' into Phase3
---
pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java | 85 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java b/pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java
index 343b767..05d8d73 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java
@@ -3,30 +3,23 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.config.ApplicationProperties.SMS;
-import com.pollex.pam.domain.Appointment;
import com.pollex.pam.repository.ConsultantRepository;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.service.util.HttpRequestUtil;
import com.pollex.pam.web.rest.errors.SendEmailFailException;
import com.pollex.pam.web.rest.errors.SendSMSFailException;
-import io.jsonwebtoken.lang.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-import org.thymeleaf.context.Context;
import org.thymeleaf.spring5.SpringTemplateEngine;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Base64;
+import java.util.*;
import java.util.Base64.Encoder;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
@Service
public class SendMsgService {
@@ -34,7 +27,7 @@
private static final Logger log = LoggerFactory.getLogger(SendMsgService.class);
private final Encoder encoder = Base64.getEncoder();
- private static final String EMAIL_SUBJECT = "靽���像�蝟餌絞�嚗���";
+ private static final String SEND_SMS_SUCCESS_CODE = "1";
@Autowired
ApplicationProperties applicationProperties;
@@ -46,7 +39,12 @@
SpringTemplateEngine springTemplateEngine;
public SendSMSResponse sendMsgBySMS(String toMobile, String content) throws SendSMSFailException {
- SMS smsProperties = applicationProperties.getSms();
+ if(!applicationProperties.isSendNotifyMsg()) {
+// return getMockSMSResponse();
+ return null;
+ }
+
+ SMS smsProperties = applicationProperties.getSms();
SendSMSRequest sendSMSRequest = new SendSMSRequest();
sendSMSRequest.setpKey(UUID.randomUUID().toString());
@@ -65,36 +63,38 @@
try {
ResponseEntity<SendSMSResponse> responseEntity = HttpRequestUtil.postWithJson(smsProperties.getUrl(), sendSMSRequest, SendSMSResponse.class);
+ SendSMSResponse response = responseEntity.getBody();
log.debug("response status code = {}", responseEntity.getStatusCode());
log.debug("smsResponse = {}", responseEntity.getBody());
+ if(!SEND_SMS_SUCCESS_CODE.equals(response.getReturnCode())) {
+ throw new SendSMSFailException("sms service return code = " + response.getReturnCode() + ", error_msg = " + response.getErrorMsg());
+ }
+
return responseEntity.getBody();
- // todo ����閬�����隤方������葫��
- }
- catch (Exception e) {
- log.debug("send sms failed!", e);
- throw new SendSMSFailException();
+ } catch (SendSMSFailException e) {
+ throw e;
+ } catch (Exception e) {
+ log.warn("send sms fail by other reason!", e);
+ throw new SendSMSFailException("send sms fail by other reason!");
}
}
- public String sendMsgByHtmlTestTemplateEmail(String from, String to) {
- Context context = new Context();
- context.setVariable("content", "閬芣��“��憟踝����蝑�靽���像������\n");
- context.setVariable("urlHint", getAppointmentDetailUrl(0L));
+// private SendSMSResponse getMockSMSResponse() {
+// SendSMSResponse mock = new SendSMSResponse();
+// mock.set
+// return null;
+// }
- String content = springTemplateEngine.process("mail/appointmentNotifyEmail", context);
- return sendMsgByEmail(from, to, EMAIL_SUBJECT, content, true);
+ public String sendMsgByEmail(String to, String subject, String content, boolean htmlFormat) throws SendEmailFailException{
+ return sendMsgByEmail(to, subject, content, htmlFormat, Collections.emptyList(), Collections.emptyList());
}
- public String sendMsgByEmail(String from, String to, String subject, String content, boolean htmlFormat) throws SendEmailFailException{
- return sendMsgByEmail(from, to, subject, content, htmlFormat, Collections.emptyList(), Collections.emptyList());
- }
-
- public String sendMsgByEmail(
- String fromAddress, String toAddress, String subject, String content, boolean htmlFormat, List<String> toCCAddress,
- List<String> attachments) throws SendEmailFailException
- {
+ public String sendMsgByEmail(String toAddress, String subject, String content, boolean htmlFormat, List<String> toCCAddress,
+ List<String> attachments) throws SendEmailFailException {
+ String fromAddress = applicationProperties.getEmail().getSenderEmail();
+
SendMailRequest sendMailRequest = new SendMailRequest();
sendMailRequest.setSendMailAddresses(Collections.singletonList(toAddress));
sendMailRequest.setFrom(fromAddress);
@@ -108,31 +108,30 @@
return sendMsgByEmail(sendMailRequest);
}
- private String sendMsgByEmail(SendMailRequest sendMailRequest) throws SendEmailFailException{
- try {
+ public String sendMsgByEmail(SendMailRequest sendMailRequest) throws SendEmailFailException{
+ if(!applicationProperties.isSendNotifyMsg()) {
+ return null;
+ }
+ try {
ResponseEntity<String> responseEntity =
HttpRequestUtil.postWithJson( applicationProperties.getEmail().getUrl(), sendMailRequest, String.class);
log.debug("responseEntity = {}", responseEntity);
- SendMailResponse sendMailResponse = new ObjectMapper().readValue(responseEntity.getBody(), SendMailResponse.class);
+ String rawResponseString = responseEntity.getBody();
+ SendMailResponse sendMailResponse = new ObjectMapper().readValue(rawResponseString, SendMailResponse.class);
log.debug("sendMailResponse = {}", sendMailResponse);
-// if(sendMailResponse == null || sendMailResponse.getData() == null || !"ADDED".equalsIgnoreCase(sendMailResponse.getData().getMessageStatus())) {
-// throw new SendEmailFailException();
-// }
+ if(sendMailResponse == null || sendMailResponse.getData() == null || !"ADDED".equalsIgnoreCase(sendMailResponse.getData().getMessageStatus())) {
+ throw new SendEmailFailException("send email service return error msg! raw response string= " + rawResponseString);
+ }
return responseEntity.getBody();
}
catch (SendEmailFailException e) {
throw e;
+ } catch (Exception e) {
+ log.warn("send email fail by other reason", e);
+ throw new SendEmailFailException("send email failed!");
}
- catch (Exception e) {
- log.debug("send email failed!", e);
- throw new SendEmailFailException();
- }
- }
-
- private String getAppointmentDetailUrl(Long appointmentId) {
- return applicationProperties.getFrontEndDomain() + "/myAppointmentList/contactedList?appointmentId=" + appointmentId;
}
}
--
Gitblit v1.8.0