ums관련 수정
This commit is contained in:
@@ -25,16 +25,13 @@ public enum MessageCode {
|
|||||||
MANAGER_WITH_ORG_REGISTER_APPROVED("법인관리자 및 법인 등록 승인", "FM_APIM007", Channels.EMAIL),
|
MANAGER_WITH_ORG_REGISTER_APPROVED("법인관리자 및 법인 등록 승인", "FM_APIM007", Channels.EMAIL),
|
||||||
MANAGER_WITH_ORG_REGISTER_REJECTED("법인관리자 및 법인 등록 거절", "FM_APIM008", Channels.EMAIL),
|
MANAGER_WITH_ORG_REGISTER_REJECTED("법인관리자 및 법인 등록 거절", "FM_APIM008", Channels.EMAIL),
|
||||||
|
|
||||||
|
|
||||||
// 관리자 영역
|
// 관리자 영역
|
||||||
APP_REGISTER_APPROVED("앱 등록 승인", "FM_APIM009", Channels.EMAIL),
|
APP_REGISTER_APPROVED("앱 등록 승인", "FM_APIM009", Channels.EMAIL),
|
||||||
APP_REGISTER_REJECTED("앱 등록 거절", "FM_APIM010", Channels.EMAIL),
|
APP_REGISTER_REJECTED("앱 등록 거절", "FM_APIM010", Channels.EMAIL),
|
||||||
|
|
||||||
|
// 제주은행
|
||||||
// API상태 모니터링
|
API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.SWING),
|
||||||
API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.MESSENGER),
|
INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.SWING),
|
||||||
// 유량제어 토큰 획득 실패
|
|
||||||
INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.MESSENGER),
|
|
||||||
|
|
||||||
|
|
||||||
// 미 사용, 미 분류
|
// 미 사용, 미 분류
|
||||||
@@ -121,7 +118,7 @@ public enum MessageCode {
|
|||||||
NONE (0b0000),
|
NONE (0b0000),
|
||||||
EMAIL (0b0001),
|
EMAIL (0b0001),
|
||||||
KAKAO_ALIMTALK (0b0010),
|
KAKAO_ALIMTALK (0b0010),
|
||||||
MESSENGER (0b0100),
|
SWING (0b0100),
|
||||||
;
|
;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ public class MessageRequest implements Serializable {
|
|||||||
private PortalUser user;
|
private PortalUser user;
|
||||||
|
|
||||||
@Comment("UMS 연계용 UID")
|
@Comment("UMS 연계용 UID")
|
||||||
@Column(name="ums_uid", length = 16)
|
@Column(name="ums_uid", length = 36)
|
||||||
private String umsUid;
|
private String umsUid;
|
||||||
|
|
||||||
@Column(name = "messenger_id")
|
@Column(name = "messenger_id")
|
||||||
|
|||||||
@@ -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("message.integration.eaiId.sms");
|
String smsEaiInterfaceId = portalProperties.get("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,14 +88,14 @@ 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("message.integration.template.sms." + template.getMessageCode()));
|
smsRequest.setServiceId(portalProperties.get("ums.sms.tx_id"));
|
||||||
smsRequest.setMessageType("KAKAO");
|
smsRequest.setMessageType("SMS");
|
||||||
messageRequestRepository.save(smsRequest);
|
messageRequestRepository.save(smsRequest);
|
||||||
logger.debug(smsRequest.toString());
|
logger.debug(smsRequest.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (template.getEnableEmail().equalsIgnoreCase("Y")) {
|
if (template.getEnableEmail().equalsIgnoreCase("Y")) {
|
||||||
String mailEaiInterfaceId = portalProperties.get("message.integration.eaiId.email");
|
String mailEaiInterfaceId = portalProperties.get("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);
|
||||||
@@ -105,13 +105,14 @@ 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("message.integration.template.email." + template.getMessageCode()));
|
emailRequest.setServiceId(portalProperties.get("ums.email.tx_id"));
|
||||||
emailRequest.setMessageType("EMAIL");
|
emailRequest.setMessageType("EMAIL");
|
||||||
messageRequestRepository.save(emailRequest);
|
messageRequestRepository.save(emailRequest);
|
||||||
logger.debug(emailRequest.toString());
|
logger.debug(emailRequest.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
|
if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
|
||||||
|
String swingEaiInterfaceId = portalProperties.get("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);
|
||||||
@@ -120,6 +121,9 @@ public class MessageSendService {
|
|||||||
messengerRequest.setRequestDate(LocalDateTime.now());
|
messengerRequest.setRequestDate(LocalDateTime.now());
|
||||||
messengerRequest.setUsername(user.getUsername());
|
messengerRequest.setUsername(user.getUsername());
|
||||||
messengerRequest.setMessengerId(user.getUserId());
|
messengerRequest.setMessengerId(user.getUserId());
|
||||||
|
messengerRequest.setEaiInterfaceId(swingEaiInterfaceId);
|
||||||
|
messengerRequest.setServiceId(portalProperties.get("ums.messenger.tx_id"));
|
||||||
|
messengerRequest.setMessageType("MESSENGER");
|
||||||
messageRequestRepository.save(messengerRequest);
|
messageRequestRepository.save(messengerRequest);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user