이메일 발송 테스트 코드 추가
This commit is contained in:
@@ -50,7 +50,8 @@ public class EmailJob {
|
||||
this.messageRequest = messageRequest;
|
||||
this.prop = prop;
|
||||
|
||||
String filename = messageRequest.getServiceId() + "_" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(now) + ".dat";
|
||||
// String filename = messageRequest.getServiceId() + "_" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(now) + ".dat";
|
||||
String filename = messageRequest.getServiceId() + "_" + DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS").format(now) + ".dat";
|
||||
this.eaiFilePath = Paths.get(prop.getUmsEaiBatchSendDir(), filename);
|
||||
this.backupFilePath = Paths.get(prop.getUmsEaiBatchBackupDir(), filename);
|
||||
this.failedFilePath = Paths.get(prop.getUmsEaiBatchBackupDir(), filename + ".failed");
|
||||
@@ -240,11 +241,14 @@ public class EmailJob {
|
||||
jsonObject.addProperty("ENCKEY", ""); // 보안메일용으로 기입 불필요
|
||||
|
||||
Gson gson = new Gson();
|
||||
log.debug("Template string to json: {}", messageRequest.getMessage());
|
||||
JsonObject contentJSon = gson.fromJson(messageRequest.getMessage(), JsonObject.class);
|
||||
contentJSon.entrySet().forEach(entry -> {
|
||||
jsonObject.add(entry.getKey(), entry.getValue());
|
||||
});
|
||||
String message = messageRequest.getMessage();
|
||||
log.debug("Template string to json: {}", message);
|
||||
if (StringUtils.isNotEmpty(message)) {
|
||||
JsonObject contentJSon = gson.fromJson(message, JsonObject.class);
|
||||
contentJSon.entrySet().forEach(entry -> {
|
||||
jsonObject.add(entry.getKey(), entry.getValue());
|
||||
});
|
||||
}
|
||||
|
||||
// jsonObject.addProperty("SUBJECT", messageRequest.getSubject());
|
||||
// jsonObject.addProperty("MESSAGE", messageRequest.getMessage());
|
||||
|
||||
@@ -117,8 +117,10 @@ public class KjbEmailSendModule {
|
||||
public void sendEmail(MessageRequest messageRequest) throws KjbEaiBatchException {
|
||||
String serviceId = "UNKNOWN";
|
||||
|
||||
serviceId = messageRequest.getMessageCode().getServiceId();
|
||||
messageRequest.setServiceId(serviceId);
|
||||
if (StringUtils.isEmpty(messageRequest.getServiceId())) {
|
||||
serviceId = messageRequest.getMessageCode().getServiceId();
|
||||
messageRequest.setServiceId(serviceId);
|
||||
}
|
||||
|
||||
if (StringUtils.isEmpty(serviceId)) {
|
||||
throw new IllegalArgumentException("MessageRequest MessageCode serviceId is required");
|
||||
|
||||
Reference in New Issue
Block a user