diff --git a/src/main/java/com/eactive/ext/kjb/ums/EmailJob.java b/src/main/java/com/eactive/ext/kjb/ums/EmailJob.java index fb27084..7a38cde 100644 --- a/src/main/java/com/eactive/ext/kjb/ums/EmailJob.java +++ b/src/main/java/com/eactive/ext/kjb/ums/EmailJob.java @@ -5,8 +5,8 @@ import com.eactive.apim.portal.template.entity.MessageRequest; import com.eactive.apim.portal.template.repository.MessageRequestRepository; import com.eactive.ext.kjb.common.KjbEaiBatchException; import com.eactive.ext.kjb.common.KjbProperty; -import com.eactive.ext.kjb.eai.EaiBatchMessage; import com.eactive.ext.kjb.eai.EaiBatchInterface; +import com.eactive.ext.kjb.eai.EaiBatchMessage; import com.eactive.ext.kjb.eai.KjbEaiBatchModule; import com.eactive.ext.kjb.safedb.KjbSafedbWrapper; import com.google.gson.Gson; @@ -73,7 +73,8 @@ public class EmailJob { if (messageRequest.getUser() != null) { PortalUser user = messageRequest.getUser(); - messageRequest.setUmsUid(UUIDBase62Util.uuidStringToBase62(user.getId())); +// messageRequest.setUmsUid(UUIDBase62Util.uuidStringToBase62(user.getId())); + messageRequest.setUmsUid(user.getId()); if (repository != null) { repository.save(messageRequest); @@ -124,7 +125,8 @@ public class EmailJob { if (messageRequestRepository != null) { PortalUser user = messageRequest.getUser(); if (user != null) { - messageRequest.setUmsUid(UUIDBase62Util.uuidStringToBase62(user.getId())); + // messageRequest.setUmsUid(UUIDBase62Util.uuidStringToBase62(user.getId())); + messageRequest.setUmsUid(user.getId()); } messageRequestRepository.save(messageRequest); @@ -230,7 +232,7 @@ public class EmailJob { JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("MAKE_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now())); - jsonObject.addProperty("MAKE_SEQNO", "0001"); + jsonObject.addProperty("MAKE_SEQNO", DateTimeFormatter.ofPattern("HHmmssSSS").format(LocalDateTime.now())); jsonObject.addProperty("CAMP_ID", messageRequest.getServiceId()); // 전자금융 고객이메일 발송 업무ID (SERVICE_ID) jsonObject.addProperty("ID", messageRequest.getUmsUid()); // 고객 ID jsonObject.addProperty("EMAIL", safedb.encryptNotRnnoString(messageRequest.getEmail())); diff --git a/src/test/java/com/eactive/ext/kjb/ums/test/UmsTest.java b/src/test/java/com/eactive/ext/kjb/ums/test/UmsTest.java index 3273a51..5015ef9 100644 --- a/src/test/java/com/eactive/ext/kjb/ums/test/UmsTest.java +++ b/src/test/java/com/eactive/ext/kjb/ums/test/UmsTest.java @@ -87,6 +87,7 @@ public class UmsTest { messageRequest.setId(UUID.randomUUID().toString()); messageRequest.setMessageCode(MessageCode.USER_VERIFICATION_EMAIL); messageRequest.setEmail("dearmai@dearmai.net"); + messageRequest.setUmsUid(UUID.randomUUID().toString()); messageRequest.setUsername("김광은"); messageRequest.setSubject("제목 - test"); messageRequest.setMessage("{\"ATHN_NO\": \"543216\"}");