Compare commits
5 Commits
6f00de61d9
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 72d2150a6e | |||
| c8049dd881 | |||
| 2e2ac8f462 | |||
| f3a9e19b89 | |||
| b5866b087d |
+12
-1
@@ -51,13 +51,24 @@ public class PortalPropertyService extends AbstractDataService<PortalPropertyGro
|
|||||||
Optional<PortalProperty> existingProperty = portalPropertyRepository.findById(propertyId);
|
Optional<PortalProperty> existingProperty = portalPropertyRepository.findById(propertyId);
|
||||||
|
|
||||||
if (existingProperty.isPresent()) {
|
if (existingProperty.isPresent()) {
|
||||||
return existingProperty.get().getPropertyValue();
|
PortalProperty property = existingProperty.get();
|
||||||
|
// 설명(property_desc)이 비어 있으면 코드가 넘긴 description 으로 채운다.
|
||||||
|
// (값이 있으면 관리자 편집분 보존 — 덮어쓰지 않음)
|
||||||
|
if (isBlank(property.getPropertyDesc()) && !isBlank(description)) {
|
||||||
|
property.setPropertyDesc(description);
|
||||||
|
portalPropertyRepository.save(property);
|
||||||
|
}
|
||||||
|
return property.getPropertyValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 프로퍼티가 없으면 기본값으로 생성
|
// 프로퍼티가 없으면 기본값으로 생성
|
||||||
return createDefaultProperty(groupName, propertyName, defaultValue, description);
|
return createDefaultProperty(groupName, propertyName, defaultValue, description);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static boolean isBlank(String s) {
|
||||||
|
return s == null || s.trim().isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 기본 프로퍼티를 DB에 생성
|
* 기본 프로퍼티를 DB에 생성
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -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,19 +88,15 @@ 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())) {
|
smsRequest.setMessageType("KAKAO");
|
||||||
smsRequest.setMessageType("KAKAO");
|
|
||||||
} else {
|
|
||||||
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("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 +106,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 +114,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 +124,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);
|
||||||
|
|||||||
Reference in New Issue
Block a user