Merge remote-tracking branch 'origin/master'
eapim-portal CI (from elink-portal-common) / build (push) Waiting to run

This commit is contained in:
Rinjae
2026-07-13 14:25:16 +09:00
@@ -78,7 +78,7 @@ public class MessageSendService {
String subject = buildMessage(template.getSubjectTemplate(), messageParams); String subject = buildMessage(template.getSubjectTemplate(), messageParams);
if (template.getEnableSms().equalsIgnoreCase("Y")) { if (template.getEnableSms().equalsIgnoreCase("Y")) {
String smsEaiInterfaceId = portalProperties.get("ums.sms.if_id"); String smsEaiInterfaceId = portalProperties.get("djb.ums.sms.if_id");
MessageRequest smsRequest = new MessageRequest(); MessageRequest smsRequest = new MessageRequest();
smsRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase())); smsRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase()));
smsRequest.setSubject(subject); smsRequest.setSubject(subject);
@@ -88,7 +88,7 @@ public class MessageSendService {
smsRequest.setUsername(user.getUsername()); smsRequest.setUsername(user.getUsername());
smsRequest.setPhone(user.getPhone()); smsRequest.setPhone(user.getPhone());
smsRequest.setEaiInterfaceId(smsEaiInterfaceId); smsRequest.setEaiInterfaceId(smsEaiInterfaceId);
smsRequest.setServiceId(portalProperties.get("ums.sms.tx_id")); smsRequest.setServiceId(portalProperties.get("djb.ums.sms.tx_id"));
smsRequest.setUserId(user.getUserId()); smsRequest.setUserId(user.getUserId());
if ("ADMIN_VERIFICATION_MOBILEPHONE".equals(template.getMessageCode().toUpperCase())) { if ("ADMIN_VERIFICATION_MOBILEPHONE".equals(template.getMessageCode().toUpperCase())) {
smsRequest.setMessageType("KAKAO"); smsRequest.setMessageType("KAKAO");
@@ -100,7 +100,7 @@ public class MessageSendService {
} }
if (template.getEnableEmail().equalsIgnoreCase("Y")) { if (template.getEnableEmail().equalsIgnoreCase("Y")) {
String mailEaiInterfaceId = portalProperties.get("ums.email.if_id"); String mailEaiInterfaceId = portalProperties.get("djb.ums.email.if_id");
MessageRequest emailRequest = new MessageRequest(); MessageRequest emailRequest = new MessageRequest();
emailRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase())); emailRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase()));
emailRequest.setSubject(subject); emailRequest.setSubject(subject);
@@ -110,7 +110,7 @@ public class MessageSendService {
emailRequest.setUsername(user.getUsername()); emailRequest.setUsername(user.getUsername());
emailRequest.setEmail(user.getUserId()); emailRequest.setEmail(user.getUserId());
emailRequest.setEaiInterfaceId(mailEaiInterfaceId); emailRequest.setEaiInterfaceId(mailEaiInterfaceId);
emailRequest.setServiceId(portalProperties.get("ums.email.tx_id")); emailRequest.setServiceId(portalProperties.get("djb.ums.email.tx_id"));
emailRequest.setMessageType("EMAIL"); emailRequest.setMessageType("EMAIL");
emailRequest.setUserId(user.getUserId()); emailRequest.setUserId(user.getUserId());
messageRequestRepository.save(emailRequest); messageRequestRepository.save(emailRequest);
@@ -118,7 +118,7 @@ public class MessageSendService {
} }
if (template.getEnableMessenger().equalsIgnoreCase("Y")) { if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
String swingEaiInterfaceId = portalProperties.get("ums.messenger.if_id"); String swingEaiInterfaceId = portalProperties.get("djb.ums.messenger.if_id");
MessageRequest messengerRequest = new MessageRequest(); MessageRequest messengerRequest = new MessageRequest();
messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode())); messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode()));
messengerRequest.setSubject(subject); messengerRequest.setSubject(subject);
@@ -128,7 +128,7 @@ public class MessageSendService {
messengerRequest.setUsername(user.getUsername()); messengerRequest.setUsername(user.getUsername());
messengerRequest.setMessengerId(user.getUserId()); messengerRequest.setMessengerId(user.getUserId());
messengerRequest.setEaiInterfaceId(swingEaiInterfaceId); messengerRequest.setEaiInterfaceId(swingEaiInterfaceId);
messengerRequest.setServiceId(portalProperties.get("ums.messenger.tx_id")); messengerRequest.setServiceId(portalProperties.get("djb.ums.messenger.tx_id"));
messengerRequest.setMessageType("MESSENGER"); messengerRequest.setMessageType("MESSENGER");
messengerRequest.setUserId(user.getUserId()); messengerRequest.setUserId(user.getUserId());
messageRequestRepository.save(messengerRequest); messageRequestRepository.save(messengerRequest);