Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/KJB_DEV/eapim-bundle/bundles/251204/eapim-online_incremental_2025-11-01.bundle into jenkins_with_weblogic

WebContent/WEB-INF/weblogic-web.xml

@@ -70,17 +70,17 @@
 	</filter-mapping>
 	
 	<!-- Dynamic REST API 어댑터 설정 -->
-<!--    <servlet>-->
+    <servlet>
-<!--        <description/>-->
+        <description/>
-<!--        <servlet-name>RestApiDynamicInAdapter</servlet-name>-->
+        <servlet-name>RestApiDynamicInAdapter</servlet-name>
-<!--        <servlet-class>com.eactive.eai.adapter.http.dynamic.RestApiAdapterMain</servlet-class>-->
+        <servlet-class>com.eactive.eai.adapter.http.dynamic.RestApiAdapterMain</servlet-class>
-<!--        <load-on-startup>2</load-on-startup>-->
+        <load-on-startup>2</load-on-startup>
-<!--    </servlet>-->
+    </servlet>
-<!--    <servlet-mapping>-->
+    <servlet-mapping>
-<!--        <servlet-name>RestApiDynamicInAdapter</servlet-name>-->
+        <servlet-name>RestApiDynamicInAdapter</servlet-name>
-<!--        <url-pattern>/API/*</url-pattern>-->
+        <url-pattern>/API/*</url-pattern>
-<!--        <url-pattern>/api/*</url-pattern>-->
+        <url-pattern>/api/*</url-pattern>
-<!--    </servlet-mapping>-->
+    </servlet-mapping>
     
 <!--    
     <listener>

src/main/java/com/eactive/eai/adapter/controller/ApiAdapterController.java

@@ -35,15 +35,11 @@ import com.eactive.eai.common.util.Logger;
 import com.eactive.eai.common.util.MessageUtil;
 import com.eactive.eai.common.util.UUIDGenerator;
 import com.eactive.eai.inbound.error.InboundErrorInfoVO;
-import com.kjbank.encrypt.exchange.crypto.AES256Cipher;
-import com.kjbank.encrypt.exchange.crypto.AES256GCMCipher;
-import com.kjbank.encrypt.exchange.crypto.AESCipher;
 
 // jwhong
 import org.json.simple.JSONObject;
 import java.util.HashMap;
 import java.util.Map;
-import java.sql.Timestamp;
 import com.eactive.eai.data.entity.onl.stdmessage.StandardMessageInfo;
 
 @RestController
@@ -66,12 +62,24 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
         apiUri = StringUtils.removeStart(apiUri, servletRequest.getContextPath());
         apiUri = StringUtils.removeEnd(apiUri, "/");        
 
-        HttpDynamicInAdapterUri adptUri = findAdptUri(apiUri, HttpDynamicInAdapterManager.getInstance());
+        //** jwhong TSEAIHS04의 api full path와 비교하여 adapter를 가져온다
-        
+        String methodAndUri = servletRequest.getMethod() + "|" + apiUri;
-        //Received time , jwhong
+        HttpDynamicInAdapterUri adptUri = null;
-        long receivedTimeMillis = System.currentTimeMillis();     
+        String adapterGrpName ="";
-        String receivedTimeStr = String.valueOf(receivedTimeMillis);
+        String apiSvcCode = "";
-        System.out.println("*** inbound receivedTimeStr ***"+receivedTimeStr);
+        try {
+            STDMessageDAO dao = ApplicationContextProvider.getContext().getBean(STDMessageDAO.class);
+            StandardMessageInfo stdInfo = dao.getSTDMsgByPath(methodAndUri);
+            String serviceKey = stdInfo.getBzwksvckeyname();
+            int idx = serviceKey.indexOf(":");
+            adapterGrpName = (idx != -1) ? serviceKey.substring(0, idx) : serviceKey;   // ':' 이전 문자열 추출  
+            apiSvcCode = stdInfo.getEaisvcname();
+            //아래 원래 Logic
+            adptUri = findAdptUri(apiUri, HttpDynamicInAdapterManager.getInstance(), adapterGrpName);
+        } catch (Exception e) {
+        	adptUri = null;
+        }
+        //***      
                                     
         if (logger.isDebug()) {
             logger.debug("ApiAdapterController] service request uri : " + servletRequest.getRequestURI());
@@ -83,6 +91,9 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("can not find Adapter Uri");
         }        
         
+        //Received time , jwhong
+        long receivedTimeMillis = System.currentTimeMillis();        // 밀리세컨 단위로 보내야함
+        String receivedTimeStr = String.valueOf(receivedTimeMillis);
 
         String adapterGroupName = adptUri.getAdptGrpName();
         String adapterName = adptUri.getAdptName();
@@ -103,8 +114,9 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
         String responseType = httpProp.getProperty(RESPONSE_TYPE, "SYNC");
         ResponseEntity responseEntity = null;
         Properties transactionProp = new Properties();
-        //transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeMillis);    // jwhong, put api received time
+        // jwhong, put api received time, eaiSvcCode
         transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr);  
+        transactionProp.put(API_SERVICE_CODE, apiSvcCode);
           	      
         try {
             String responseData = service.callApi(servletRequest, servletResponse, httpProp, adapterGroupVO, adapterVO, transactionProp);
@@ -171,33 +183,27 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
      * @param apiUri
      * @return
      */
-    private HttpDynamicInAdapterUri findAdptUri(String apiUri, HttpDynamicInAdapterManager manager) throws Exception {
+    private HttpDynamicInAdapterUri findAdptUri(String apiUri, HttpDynamicInAdapterManager manager, String adapterGrpName) throws Exception {
         if (StringUtils.isBlank(apiUri)) {
             return null;
         }      
         
-        //** jwhong TSEAIHS04의 api full path와 비교하여 adapter를 가져온다 
+        //* manager 출력
-        STDMessageDAO dao = ApplicationContextProvider.getContext().getBean(STDMessageDAO.class);
+        logger.warn("===== adptUriMap 상세 내용 =====");
-        StandardMessageInfo stdInfo = dao.getSTDMsgByPath(apiUri);
-        String serviceKey = stdInfo.getBzwksvckeyname();
-        int idx = serviceKey.indexOf(":");
-        String adapterGrpName = (idx != -1) ? serviceKey.substring(0, idx) : serviceKey;   // ':' 이전 문자열 추출     
-        //***       
-
-        System.out.println("====== adptUriMap 상세 내용 =======");
         for (Map.Entry<String, HttpDynamicInAdapterUri> entry : manager.adptUriMap.entrySet()) {
             HttpDynamicInAdapterUri uriObj = entry.getValue();
-        	System.out.println("GroupName="+uriObj.getAdptGrpName() 
+            logger.warn("GroupName=" + uriObj.getAdptGrpName()
                 + ", AdapterName=" + uriObj.getAdptName()
                 + ", URI=" + uriObj.getUri());
         }
-        System.out.println("================================"); 
+        logger.warn("================================");
+
+        
+        //
 
         for (int i = 0; i < 10; i++) {
             HttpDynamicInAdapterUri adptUri = manager.getAdptUri(apiUri);
             if (adptUri != null) {
-            	System.out.println("*****adptUri.getAdptGrpName() "+ adptUri.getAdptGrpName());
-            	System.out.println("*****getAdptGrpName "+ adapterGrpName);
             	if (adptUri.getAdptGrpName().equals(adapterGrpName)) {
             		return adptUri;
             	}
@@ -205,7 +211,6 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
 
             // /api/v1/public
             apiUri = StringUtils.substringBeforeLast(apiUri, "/");
-            System.out.println("*****apiUri "+ apiUri);
             if (apiUri.length() < 4) { // /api
                 return null;
             }
@@ -294,6 +299,4 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
 		return json.toJSONString(); 
     }
     */
-
-
 }

src/main/java/com/eactive/eai/adapter/service/ApiAdapterService.java

@@ -448,6 +448,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
          // end test source
  	
  		switch (decryptAlgorithm) {
+ 		case "AES128":	
  		case "AES128-TOSS":			
  		    try {
  	 		    String key128 = clientSecretKey.substring(22,38);   //togetherEncoder 경우는 substring(44,60) 이네?? 
@@ -532,6 +533,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
 		String decryptedBodyMessage = "";
 		
 		switch (decryptAlgorithm) {
+		case "AES128":
 		case "AES128-TOSS":
 			decryptedJsonKey = "preScreeningRequest"; 			
 			break;
@@ -587,6 +589,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
          // end test source
  	
  		switch (encryptAlgorithm) {
+ 		case "AES128":		
  		case "AES128-TOSS":			
  		    try {
  	 		    String key128 = clientSecretKey.substring(22,38);   //togetherEncoder 경우는 substring(44,60) 이네??