From 73a50e5db40642052db04bd3d69dda4d7819e7fc Mon Sep 17 00:00:00 2001 From: curry772 Date: Mon, 20 Jul 2026 11:13:27 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=B8=ED=99=95=EC=9D=B8=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EB=A1=9C=EA=B7=B8=20=EC=B6=9C=EB=A0=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20favicon.ico=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=ED=95=98=EC=A7=80=EC=95=8A=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DJBApiAdapterController.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/eactive/eai/adapter/controller/DJBApiAdapterController.java b/src/main/java/com/eactive/eai/adapter/controller/DJBApiAdapterController.java index 9752629..28c65a2 100644 --- a/src/main/java/com/eactive/eai/adapter/controller/DJBApiAdapterController.java +++ b/src/main/java/com/eactive/eai/adapter/controller/DJBApiAdapterController.java @@ -67,7 +67,7 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { "/tsb/{path:^(?!oauth).*$}", "/tsb/{path:^(?!oauth).*$}/**", "/shb/{path:^(?!oauth).*$}", "/shb/{path:^(?!oauth).*$}/**", "/tst/{path:^(?!oauth).*$}", "/tst/{path:^(?!oauth).*$}/**", - "/**/{path:^(?!oauth).*$}", "/**/{path:^(?!oauth).*$}/**", + "/**/{path:^(?!oauth)(?!favicon\\.ico$).*$}", "/**/{path:^(?!oauth)(?!favicon\\.ico$).*$}/**", }) public ResponseEntity callApi(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws Exception { @@ -83,17 +83,25 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { logger.debug("ApiAdapterController] service request uri : " + servletRequest.getRequestURI()); } - if (adptUri == null) { - logError(servletRequest); - String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND, - "can not find Adapter Uri"); - return ResponseEntity.status(HttpStatus.NOT_FOUND).contentType(MediaType.APPLICATION_JSON).body(errorMsg); - } - // Received time , jwhong long receivedTimeMillis = System.currentTimeMillis(); // 밀리세컨 단위로 보내야함 String receivedTimeStr = String.valueOf(receivedTimeMillis); + ResponseEntity responseEntity = null; + Properties transactionProp = new Properties(); + String uuid = UUIDGenerator.getUUID().toString().replaceAll("-", ""); + transactionProp.setProperty(TransactionContextKeys.TRANSACTION_UUID, uuid); + transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr); + + if (adptUri == null) { + //logError(servletRequest); + String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND, + "can not find Adapter Uri"); + logError(servletRequest, "HTTP_IN_NO_URI", MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND, + errorMsg, transactionProp, null); + return ResponseEntity.status(HttpStatus.NOT_FOUND).contentType(MediaType.APPLICATION_JSON).body(errorMsg); + } + String adapterGroupName = adptUri.getAdptGrpName(); String adapterName = adptUri.getAdptName(); AdapterGroupVO adapterGroupVO = AdapterManager.getInstance().getAdapterGroupVO(adapterGroupName); @@ -101,6 +109,8 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { if (adapterVO == null) { String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AP_ERROR, "Adapter not found error"); + logError(servletRequest, adapterGroupName, MessageUtil.ERROR_CODE_AP_ERROR, + errorMsg, transactionProp, null); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).contentType(MediaType.APPLICATION_JSON) .body(errorMsg); } @@ -112,16 +122,10 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { MediaType mediaType = MediaType.valueOf("application/json;charset=" + encode); String errorResponseFormat = httpProp.getProperty(ERROR_RESPONSE_FORMAT); - ResponseEntity responseEntity = null; - Properties transactionProp = new Properties(); - String uuid = UUIDGenerator.getUUID().toString().replaceAll("-", ""); - transactionProp.setProperty(TransactionContextKeys.TRANSACTION_UUID, uuid); TxSiftContext.begin(uuid); // jwhong, put api received time, eaiSvcCode - transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr); - String responseData = ""; try { responseData = service.callApi(servletRequest, servletResponse, httpProp, adapterGroupVO, adapterVO,