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 577b55b..bed627b 100644 --- a/src/main/java/com/eactive/eai/adapter/controller/DJBApiAdapterController.java +++ b/src/main/java/com/eactive/eai/adapter/controller/DJBApiAdapterController.java @@ -22,6 +22,7 @@ import com.eactive.eai.adapter.AdapterVO; import com.eactive.eai.adapter.handler.AdapterErrorMessageHandler; import com.eactive.eai.adapter.handler.AdapterErrorMessageHandlerFactory; import com.eactive.eai.adapter.http.HttpStatusException; +import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey; import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey; import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport; import com.eactive.eai.adapter.http.dynamic.HttpDynamicInAdapterManager; @@ -136,29 +137,36 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { } catch (Exception e) { logger.error(adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e); - String errorMsg = null; + String responseErrorMsg = null; - errorMsg = genErrorResponseMessage(adapterGroupName, adapterName, - transactionProp, e, adptMsgType, encode, errorResponseFormat); if (e instanceof FilterException) { + responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName, + transactionProp, MessageUtil.ERROR_CODE_AP_ERROR, e, adptMsgType, encode, errorResponseFormat); FilterException e1 = (FilterException) e; - this.logError(servletRequest, uuid, adapterGroupName, e1.getCode(), errorMsg, transactionProp, e); + this.logError(servletRequest, adapterGroupName, e1.getCode(), responseErrorMsg, transactionProp, e); logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage()); - responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(errorMsg); + responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(responseErrorMsg); } else if (e instanceof JwtAuthException) { + responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName, + transactionProp, MessageUtil.ERROR_CODE_AP_ERROR, e, adptMsgType, encode, errorResponseFormat); JwtAuthException e1 = (JwtAuthException) e; - this.logError(servletRequest, uuid, adapterGroupName, e1.getCode(), errorMsg, transactionProp, e); + this.logError(servletRequest, adapterGroupName, e1.getCode(), responseErrorMsg, transactionProp, e); logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e); - responseEntity = ResponseEntity.status(HttpStatus.UNAUTHORIZED).contentType(mediaType).body(errorMsg); + responseEntity = ResponseEntity.status(HttpStatus.UNAUTHORIZED).contentType(mediaType).body(responseErrorMsg); } else if (e instanceof HttpStatusException) { + responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName, + transactionProp, MessageUtil.ERROR_CODE_AUTH_FAIL, e, adptMsgType, encode, errorResponseFormat); logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage()); HttpStatusException e1 = (HttpStatusException) e; - responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(errorMsg); + responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(responseErrorMsg); } else { + responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName, + transactionProp, MessageUtil.ERROR_CODE_AP_ERROR, e, adptMsgType, encode, errorResponseFormat); + this.logError(servletRequest, adapterGroupName, MessageUtil.ERROR_CODE_AP_ERROR, responseErrorMsg, transactionProp, e); logger.error(adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e); - responseEntity = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).contentType(mediaType).body(errorMsg); + responseEntity = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).contentType(mediaType).body(responseErrorMsg); } - responseData = errorMsg; + responseData = responseErrorMsg; } finally { /** @@ -178,7 +186,7 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { } private String genErrorResponseMessage(String adapterGroupName, String adapterName, - Properties callProp, Throwable e, String adptMsgType, String encode, String errorResponseFormat) { + Properties callProp, String code, Throwable e, String adptMsgType, String encode, String errorResponseFormat) { String errorHandlerClass = AdapterPropManager.getInstance().getProperty(adapterName, "ERR_MSG_HANDLER"); if (StringUtils.isNotBlank(errorHandlerClass)) { if (logger.isInfo()) @@ -187,6 +195,7 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { if (handler != null) { Object resposne; try { + callProp.put("INBOUND_RESULT_CODE", code); resposne = handler.generateNonStandardInboundErrorResponseMessage(adapterGroupName, adapterName, callProp, null, null, e); return (String)resposne; @@ -197,7 +206,7 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { } } return MessageUtil.makeErrorMessageByMessageType(adptMsgType, encode, - MessageUtil.ERROR_CODE_AP_ERROR, e.getMessage(), errorResponseFormat); + code, e.getMessage(), errorResponseFormat); } /** @@ -250,21 +259,14 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { String errorCode = "RECEAIIRP010"; String[] msgArgs = new String[1]; msgArgs[0] = request.getRequestURI(); - EAIServerManager eaiServerManager = EAIServerManager.getInstance(); - String serverName = eaiServerManager.getLocalServerName(); - - String instanceid1 = serverName.substring(0, 2); - String instanceid2 = serverName.substring(serverName.length() - 2, serverName.length()); - String instid = instanceid1 + instanceid2; - String uuid = instid + UUIDGenerator.getUUID(); - this.logError(request, uuid, "HTTP_IN_NO_URI", errorCode, + this.logError(request, "HTTP_IN_NO_URI", errorCode, ExceptionUtil.make(new Exception("cat not find uri"), errorCode, msgArgs), null, null); } catch (Throwable t) { logger.warn("inbound logging failed", t); } } - private void logError(HttpServletRequest request, String uuid, String adapterGroupName, String errorCode, + private void logError(HttpServletRequest request, String adapterGroupName, String errorCode, String errorMsg, Properties prop, Exception e) { try { EAIServerManager eaiServerManager = EAIServerManager.getInstance(); @@ -272,7 +274,15 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey { InboundErrorInfoVO errorInfoVO = new InboundErrorInfoVO(); - errorInfoVO.setEaiSvcSno(uuid); // EAI서비스일련번호 + String txId = prop.getProperty(TransactionContextKeys.TRANSACTION_UUID); + if (StringUtils.isEmpty(txId)) { + String instanceid1 = serverName.substring(0, 2); + String instanceid2 = serverName.substring(serverName.length() - 2, serverName.length()); + String instid = instanceid1 + instanceid2; + txId = instid + UUIDGenerator.getUUID(); + } + + errorInfoVO.setEaiSvcSno(txId); // EAI서비스일련번호 errorInfoVO.setAdptBwkGrpNm(adapterGroupName); // 어댑터업무그룹명 errorInfoVO.setErrCd(errorCode); // 에러코드 errorInfoVO.setErrTxt(errorMsg); // 에러내용