Merge branch 'jenkins_with_weblogic' into devs/gw-metrics

src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java

@@ -43,8 +43,8 @@ public class UmsDispatchService {
     private EntityManager entityManager;
 
     private final MessageRequestRepository messageRequestRepository;
-    private final KjbUmsService kjbUmsService;
-    private final KjbEmailSendModule kjbEmailSendModule;
+    private KjbUmsService kjbUmsService;
+    private KjbEmailSendModule kjbEmailSendModule;
     private final KjbPropertyInjector kjbPropertyInjector;
 
 
@@ -83,9 +83,13 @@ public class UmsDispatchService {
 //        prop.setUmsApiKey(monitoringPropertyService.getPrpty2ValById(PROP_GORUP_ID, "kjb.ums.api_key"));
         prop = kjbPropertyInjector.inject(prop);
 
-        this.kjbUmsService = new KjbUmsService(prop);
+        try {
+            this.kjbUmsService = new KjbUmsService(prop);
 
-        this.kjbEmailSendModule = KjbEmailSendModule.getInstance(prop, messageRequestRepository);
+            this.kjbEmailSendModule = KjbEmailSendModule.getInstance(prop, messageRequestRepository);
+        } catch (Exception e) {
+            log.error("Failed to initialize KjbUmsService or KjbEmailSendModule: {}", e.getMessage(), e);
+        }
     }
 
     @SuppressWarnings("unchecked")

src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java

@@ -420,6 +420,9 @@ public class ApiInterfaceService extends OnlBaseService {
             case "NET":
                 outbndRoutName = "SOCKETOUT";
                 break;
+            case "APP":
+                outbndRoutName = "APPOUT";
+                break;
             default:
                 outbndRoutName = "RESTOUT";
                 break;
@@ -591,6 +594,7 @@ public class ApiInterfaceService extends OnlBaseService {
         
         // 25.11.25 HS04 APIFULLPATH 추가.
         List<AdapterUI> adapters = adapterGroup.getAdapters();
+        String inboundHttpMethod = vo.getInboundHttpMethod().toUpperCase();
         
         for (AdapterUI adapter : adapters) {
         	
@@ -603,7 +607,7 @@ public class ApiInterfaceService extends OnlBaseService {
         		for (AdapterPropUI prop : props) {
         			if("API_PATH".equals(prop.getPrptyname())) {
         				
-        				String fullPath = prop.getPrpty2val() + "/" + vo.getInboundRestPath();
+        				String fullPath = inboundHttpMethod + "|" + prop.getPrpty2val() + "/" + vo.getInboundRestPath();
         				vo.setApiFullPath(fullPath);
         				
         				break;

src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingController.java

@@ -454,11 +454,11 @@ public class DbTrackingController {
 
 	@RequestMapping(value = "/onl/transaction/tracking/trackingMan.json", params = "cmd=DETAIL_HTTP_LOG")
 	public ResponseEntity<HttpAdapterExtraLogVo> selectHttpAdapterExtraLog(
-							@RequestParam int dayOfWeekNumber,
+							@RequestParam String prcsDate,
 							@RequestParam String guid,
 							@RequestParam int serviceProcessNumber) {
 		return ResponseEntity.ok(service.selectHttpAdapterExtraLog(
-								dayOfWeekNumber, guid, serviceProcessNumber));
+				prcsDate, guid, serviceProcessNumber));
 	}
 
 	@RequestMapping(value = "/onl/transaction/tracking/trackingMan.json", params = "cmd=DETAIL_8583")

src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java

@@ -439,18 +439,23 @@ public class DbTrackingService extends BaseService {
 		return map;
 	}
 
-	public HttpAdapterExtraLogVo selectHttpAdapterExtraLog(int dayOfWeekNumber,
+	public HttpAdapterExtraLogVo selectHttpAdapterExtraLog(String prcsDate,
 							String guid, int serviceProcessNumber) {
-		Optional<HttpAdapterExtraLog> optional = httpAdapterExtraLogService
-								.findById(new HttpAdapterExtraLogId(
-														dayOfWeekNumber, guid,
-														serviceProcessNumber));
+		HttpAdapterExtraLogId httpAdapterExtraLogId = new HttpAdapterExtraLogId();
+		httpAdapterExtraLogId.setPrcsDate(prcsDate);
+		httpAdapterExtraLogId.setGuid(guid);
+		httpAdapterExtraLogId.setServiceProcessNumber(serviceProcessNumber);
 
-		if (optional.isPresent()) {
-			return httpAdapterExtraLogMapper.toVo(optional.get());
-		}
+		HttpAdapterExtraLog httpAdapterExtraLog = httpAdapterExtraLogService.getById(httpAdapterExtraLogId);
+//		Optional<HttpAdapterExtraLog> optional = httpAdapterExtraLogService
+//								.findById(new HttpAdapterExtraLogId(
+//										prcsDate, guid, serviceProcessNumber));
+//
+//		if (optional.isPresent()) {
+//			return httpAdapterExtraLogMapper.toVo(optional.get());
+//		}
 
-		return null;
+		return httpAdapterExtraLogMapper.toVo(httpAdapterExtraLog);
 	}
 	
 	public String resultByMessage(EAILogDetailSearch paramVo,