260803_02_ENH: 추후 첨부파일 발송을 위한 프링고 parameter-send로 발송 방식 교체 및 메일 발송 시 <mark> 태그 <span>으로 교체해서 발송되도록 수정
This commit is contained in:
@@ -9,8 +9,8 @@ import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.common.external.pringo.PringoApiClient;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoJsonSendRequestDto;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoJsonSendResponseDto;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoSendRequestDto;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoSendResponseDto;
|
||||
import com.kri.notihub.server.dto.send.DestInfoDto;
|
||||
import com.kri.notihub.server.dto.send.SendInternalResultDto;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
@@ -84,7 +84,7 @@ public abstract class AbstractPringoSendService extends AbstractSendService {
|
||||
|
||||
return SendInternalResultDto.of(cmid, SendStatusType.STANDBY, NotihubConst.EMAIL_STANDBY);
|
||||
} else {
|
||||
PringoJsonSendRequestDto pringoReq = buildPringoSendRequest(
|
||||
PringoSendRequestDto pringoReq = buildPringoSendRequest(
|
||||
sendEml,
|
||||
sendNm,
|
||||
msgTitle,
|
||||
@@ -95,13 +95,14 @@ public abstract class AbstractPringoSendService extends AbstractSendService {
|
||||
}
|
||||
}
|
||||
|
||||
public SendInternalResultDto sendPringoEmail(PringoJsonSendRequestDto pringoReq) {
|
||||
PringoJsonSendResponseDto pringoRes = null;
|
||||
public SendInternalResultDto sendPringoEmail(PringoSendRequestDto pringoReq) {
|
||||
PringoSendResponseDto pringoRes = null;
|
||||
try {
|
||||
if(StringUtil.isNullOrBlank(pringoReq.getRecipientName())){
|
||||
pringoReq.setRecipientName(pringoReq.getRecipient());
|
||||
}
|
||||
pringoRes = pringoApiClient.jsonSend(pringoReq);
|
||||
// pringoRes = pringoApiClient.jsonSend(pringoReq);
|
||||
pringoRes = pringoApiClient.parameterSend(pringoReq);
|
||||
} catch (Exception e) {
|
||||
log.warn("Pringo json-send failed (pringoReq={})", pringoReq, e);
|
||||
}
|
||||
@@ -135,7 +136,7 @@ public abstract class AbstractPringoSendService extends AbstractSendService {
|
||||
}
|
||||
}
|
||||
|
||||
public PringoJsonSendRequestDto buildPringoSendRequest(
|
||||
public PringoSendRequestDto buildPringoSendRequest(
|
||||
String sendEml,
|
||||
String sendNm,
|
||||
String msgTitle,
|
||||
@@ -147,7 +148,7 @@ public abstract class AbstractPringoSendService extends AbstractSendService {
|
||||
vars.putAll(dest.getMsgParam());
|
||||
}
|
||||
|
||||
return PringoJsonSendRequestDto.builder()
|
||||
return PringoSendRequestDto.builder()
|
||||
.sender(sendEml)
|
||||
.senderName(Optional.ofNullable(sendNm).orElse(""))
|
||||
.recipient(dest.getDestEml())
|
||||
@@ -158,7 +159,7 @@ public abstract class AbstractPringoSendService extends AbstractSendService {
|
||||
.build();
|
||||
}
|
||||
|
||||
private String resolveEmailCmid(PringoJsonSendResponseDto pringoRes) {
|
||||
private String resolveEmailCmid(PringoSendResponseDto pringoRes) {
|
||||
if (pringoRes != null && pringoRes.isSuccess() && pringoRes.getReturnKey() != null) {
|
||||
return String.valueOf(pringoRes.getReturnKey());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user