Merge branch 'jenkins_with_weblogic' of ssh://192.168.240.178:18081/eapim/eapim-admin-kjb into jenkins_with_weblogic

src/main/java/com/eactive/ext/kjb/obp/KjbObpModule.java

@@ -2,6 +2,7 @@ package com.eactive.ext.kjb.obp;
 
 import com.eactive.ext.kjb.common.KjbObpException;
 import com.eactive.ext.kjb.common.KjbProperty;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
@@ -11,12 +12,18 @@ public class KjbObpModule {
 
     private static KjbObpModule _instance;
 
+    @Getter
     private final KjbProperty property;
     private final ObpClient client;
 
     public static synchronized KjbObpModule getInstance(KjbProperty kjbProperty) {
         if (_instance == null) {
             _instance = new KjbObpModule(kjbProperty);
+        } else {
+            if (kjbProperty.equals(_instance.getProperty())) {
+                log.debug("KjbProperty 파라미터가 변경되어 KjbObpModule 인스턴스 재 생성");
+                _instance = new KjbObpModule(kjbProperty);
+            }
         }
         return _instance;
     }

src/main/java/com/eactive/ext/kjb/obp/ObpClient.java

@@ -1,6 +1,7 @@
 package com.eactive.ext.kjb.obp;
 
 import com.eactive.ext.kjb.common.KjbProperty;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
@@ -23,6 +24,7 @@ import java.util.concurrent.*;
 public class ObpClient {
     private static ObpClient _instance;
 
+    @Getter
     private final KjbProperty property;
     private final CloseableHttpClient httpClient;
     private final RequestConfig requestConfig;
@@ -31,6 +33,11 @@ public class ObpClient {
     public synchronized static ObpClient getInstance(KjbProperty kjbProperty) {
         if (_instance == null) {
             _instance = new ObpClient(kjbProperty);
+        } else {
+            if (kjbProperty.equals(_instance.getProperty())) {
+                log.debug("KjbProperty 파라미터가 변경되어 ObpClient 인스턴스 재 생성");
+                _instance = new ObpClient(kjbProperty);
+            }
         }
 
         return _instance;

src/test/java/com/eactive/ext/kjb/ums/test/UmsTest.java

@@ -27,7 +27,7 @@ public class UmsTest {
     public static void init() {
         prop =  new KjbProperty();
         prop.setEaiBatchUrl("http://172.31.32.111:10230/BATAppWeb/EaiBatCall");
-        prop.setUmsEaiBatchInterfaceId("UAGFF00001UIE");
+        prop.setUmsEaiBatchInterfaceId("UIEFF00001UAG");
 
         prop.setUmsHostUrl("http://172.31.35.144:9021");
         prop.setUmsApiKey("7cca6d58-e4f7-474d-9edd-525806bc99ff");
@@ -145,7 +145,7 @@ public class UmsTest {
         MessageRequest messageRequest = new MessageRequest();
         messageRequest.setId(UUID.randomUUID().toString());
         messageRequest.setMessageCode(messageCode);
-        messageRequest.setEmail("dearmai@dearmai.net");
+        messageRequest.setEmail("25W0064@kjbank.com");
         messageRequest.setUmsUid(UUID.randomUUID().toString());
         messageRequest.setUsername("김광은");
         messageRequest.setSubject("제목 - test");