diff --git a/src/main/java/com/eactive/ext/kjb/common/KjbProperty.java b/src/main/java/com/eactive/ext/kjb/common/KjbProperty.java index 850d074..167b3c2 100644 --- a/src/main/java/com/eactive/ext/kjb/common/KjbProperty.java +++ b/src/main/java/com/eactive/ext/kjb/common/KjbProperty.java @@ -32,8 +32,8 @@ public class KjbProperty { private String umsEaiBatchInterfaceId; - @Pattern(regexp = "^(https?://[^\\s/$.?#][^\\s]*)|\\s*$", message = "kjb.ums.url 는 유효한 URL 형식이거나 공백이어야 합니다. 예: http://example.com/api") - private String umsUrl; + @Pattern(regexp = "^(https?://[^\\s/$.?#][^\\s]*)|\\s*$", message = "kjb.ums.host_url 는 유효한 URL 형식이거나 공백이어야 합니다. 예: http://example.com/api") + private String umsHostUrl; @Pattern(regexp = "^[a-zA-Z0-9_-]{36}$", message = "kjb.ums.api_key 입력 형식이 맞지 않습니다.") private String umsApiKey; diff --git a/src/main/java/com/eactive/ext/kjb/ums/KjbUmsService.java b/src/main/java/com/eactive/ext/kjb/ums/KjbUmsService.java index defe9e8..0f321b1 100644 --- a/src/main/java/com/eactive/ext/kjb/ums/KjbUmsService.java +++ b/src/main/java/com/eactive/ext/kjb/ums/KjbUmsService.java @@ -11,7 +11,6 @@ import com.eactive.ext.kjb.utils.ValidationUtil; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.config.RequestConfig; @@ -52,7 +51,7 @@ public class KjbUmsService { throw new IllegalArgumentException("property is null"); } - isRealMode = property.getUmsUrl() != null && StringUtils.isNotEmpty(property.getUmsUrl().trim()); + isRealMode = property.getUmsHostUrl() != null && StringUtils.isNotEmpty(property.getUmsHostUrl().trim()); if (isRealMode) { ValidationUtil.validateOrThrow(property); @@ -84,7 +83,7 @@ public class KjbUmsService { content = VerifyPhoneUmsTemplate.builder().authNumber(messageRequest.getMessage()).build(); String umsMessageId = this.sendKakaoAlimTalk(messageRequest.getId(), - UmzBizWorkCode.VERIFY_PHONE, + UmsBizWorkCode.VERIFY_PHONE, messageRequest.getPhone(), content ); @@ -94,7 +93,7 @@ public class KjbUmsService { return true; } - public String sendKakaoAlimTalk(String guid, UmzBizWorkCode bizWorkCode, String cpno, IUmsGsonObject content) { + public String sendKakaoAlimTalk(String guid, UmsBizWorkCode bizWorkCode, String cpno, IUmsGsonObject content) { if (content == null) { throw new IllegalArgumentException("content is null"); } @@ -140,7 +139,7 @@ public class KjbUmsService { Gson gson = new Gson(); String json = gson.toJson(requestPayload); - HttpPost httpPost = new HttpPost(property.getUmsUrl() + url); + HttpPost httpPost = new HttpPost(property.getUmsHostUrl() + url); httpPost.setHeader("Content-Type", CONTENT_TYPE); httpPost.setHeader("Authorization", String.format(AUTHORIZATION_FMT, property.getUmsApiKey())); httpPost.setEntity(EntityBuilder.create().setText(json).setContentType(ContentType.APPLICATION_JSON).build()); diff --git a/src/main/java/com/eactive/ext/kjb/ums/UmzBizWorkCode.java b/src/main/java/com/eactive/ext/kjb/ums/UmsBizWorkCode.java similarity index 80% rename from src/main/java/com/eactive/ext/kjb/ums/UmzBizWorkCode.java rename to src/main/java/com/eactive/ext/kjb/ums/UmsBizWorkCode.java index 10c7f3b..b56d628 100644 --- a/src/main/java/com/eactive/ext/kjb/ums/UmzBizWorkCode.java +++ b/src/main/java/com/eactive/ext/kjb/ums/UmsBizWorkCode.java @@ -2,7 +2,7 @@ package com.eactive.ext.kjb.ums; import lombok.Getter; -public enum UmzBizWorkCode { +public enum UmsBizWorkCode { MONITORING("B_ELFN_09510", "OBP 모니터링"), VERIFY_PHONE("S55_ICT_0006", "API Portal 인증번호"), ; @@ -12,7 +12,7 @@ public enum UmzBizWorkCode { @Getter private String displayName; - UmzBizWorkCode(String code, String displayName) { + UmsBizWorkCode(String code, String displayName) { this.code = code; this.displayName = displayName; } 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 5c838a7..527b377 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 @@ -41,7 +41,7 @@ public class UmsTest { "true".equalsIgnoreCase(System.getenv("KJB_EAPIM_TEST_ENABLED")), "OS 환경변수 내 KJB_EAPIM_TEST_ENABLED=TRUE 설정되어 있어야 동작함"); - prop.setUmsUrl("http://172.31.35.144:9021/ums/openapi/send"); + prop.setUmsHostUrl("http://172.31.35.144:9021"); prop.setUmsApiKey("7cca6d58-e4f7-474d-9edd-525806bc99ff"); MessageRequest messageRequest = new MessageRequest();