[fix] 調整簡訊標題，需中文10字以內並為base64編碼

wayne

2021-12-24 49e325f40f9721521de975fdd5f3d37f6fe78852

 pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java

@@ -1,16 +1,23 @@
package com.pollex.pam.service;

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;
@@ -27,10 +34,18 @@
    private static final Logger log = LoggerFactory.getLogger(SendMsgService.class);
    private final Encoder encoder = Base64.getEncoder();

    private static final String EMAIL_SUBJECT = "保誠媒合平台系統通知：新預約單";

    @Autowired
    ApplicationProperties applicationProperties;

    public void sendMsgBySMS(String toMobile, String content) throws SendSMSFailException{
    @Autowired
    ConsultantRepository consultantRepository;

    @Autowired
    SpringTemplateEngine springTemplateEngine;

    public SendSMSResponse sendMsgBySMS(String toMobile, String content) throws SendSMSFailException {
        SMS smsProperties = applicationProperties.getSms();

        SendSMSRequest sendSMSRequest = new SendSMSRequest();
@@ -39,7 +54,7 @@
        sendSMSRequest.setSender(smsProperties.getSender());
        sendSMSRequest.setMsgTypeSet(smsProperties.getSmsType());
        sendSMSRequest.setSendTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:00")));
        sendSMSRequest.setSubject("");
        sendSMSRequest.setSubject(encoder.encodeToString(smsProperties.getSubject().getBytes(StandardCharsets.UTF_8)));
        sendSMSRequest.setActivityId("");

        SMSDetail smsDetail = new SMSDetail();
@@ -54,6 +69,7 @@
            log.debug("response status code = {}", responseEntity.getStatusCode());
            log.debug("smsResponse = {}", responseEntity.getBody());

            return responseEntity.getBody();
            // todo 可能需要再補上後續錯誤處理，但要先測通
        }
        catch (Exception e) {
@@ -62,11 +78,20 @@
        }
    }

    public void sendMsgByEmail(String from, String to, String subject, String content, boolean htmlFormat) throws SendEmailFailException{
        sendMsgByEmail(from, to, subject, content, htmlFormat, Collections.emptyList(), Collections.emptyList());
    public String sendMsgByHtmlTestTemplateEmail(String from, String to) {
        Context context = new Context();
        context.setVariable("content", "親愛的顧問您好，您有一筆來自保誠媒合平台的新預約單\n");
        context.setVariable("urlHint", getAppointmentDetailUrl(0L));

        String content = springTemplateEngine.process("mail/appointmentNotifyEmail", context);
        return sendMsgByEmail(from, to, EMAIL_SUBJECT, content, true);
    }

    public void sendMsgByEmail(
    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
    {
@@ -80,21 +105,23 @@
        sendMailRequest.setHtmlFormat(htmlFormat);
        sendMailRequest.setFunctionId(applicationProperties.getEmail().getFunctionId());

        sendMsgByEmail(sendMailRequest);
        return sendMsgByEmail(sendMailRequest);
    }

    public void sendMsgByEmail(SendMailRequest sendMailRequest) throws SendEmailFailException{
    private String sendMsgByEmail(SendMailRequest sendMailRequest) throws SendEmailFailException{
        try {
            ResponseEntity<SendMailResponse> responseEntity =
                HttpRequestUtil.postWithJson( applicationProperties.getEmail().getUrl(), sendMailRequest, SendMailResponse.class);
            ResponseEntity<String> responseEntity =
                HttpRequestUtil.postWithJson( applicationProperties.getEmail().getUrl(), sendMailRequest, String.class);
            log.debug("responseEntity = {}", responseEntity);

            SendMailResponse sendMailResponse = responseEntity.getBody();
            log.debug("response status code = {}", responseEntity.getStatusCode());
            log.debug("emailResponse = {}", responseEntity.getBody());
            SendMailResponse sendMailResponse = new ObjectMapper().readValue(responseEntity.getBody(), 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();
//            }

            return responseEntity.getBody();
        }
        catch (SendEmailFailException e) {
            throw e;
@@ -104,4 +131,8 @@
            throw new SendEmailFailException();
        }
    }

    private String getAppointmentDetailUrl(Long appointmentId) {
        return applicationProperties.getFrontEndDomain() + "/myAppointmentList/contactedList?appointmentId=" + appointmentId;
    }
}