From 2c21c691dfa79661dbdba0ad45814630e0eeae14 Mon Sep 17 00:00:00 2001 From: curry772 Date: Tue, 23 Jun 2026 09:23:17 +0900 Subject: [PATCH] =?UTF-8?q?UnkownMessageLogUtils.logUnkownMessage=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamic/HttpAdapterServiceSupport.java | 8 +- .../impl/HttpAdapterServiceStandard.java | 89 ++++++++++--------- 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceSupport.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceSupport.java index 794a0b6..bcb1ca3 100644 --- a/src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceSupport.java +++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceSupport.java @@ -70,13 +70,13 @@ public abstract class HttpAdapterServiceSupport implements HttpAdapterService, H throw e; } catch (JwtAuthException e) { // filter error logger.error(LOG_PREFIX + transactionId + "-" + adptGrpName + "-" + adptName + ">>" + e.getMessage(), e); - UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, message, prop, request, response, - "RECEAIIRP202", e); +// UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, message, prop, request, response, +// "RECEAIIRP202", e); throw e; } catch (Exception e) { // filter error logger.error(LOG_PREFIX + transactionId + "-" + adptGrpName + "-" + adptName + ">>" + e.getMessage(), e); - UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, message, prop, request, response, - "RECEAIIRP201", e); +// UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, message, prop, request, response, +// "RECEAIIRP201", e); throw e; } diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java index d613ae1..4f1920d 100644 --- a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java +++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java @@ -1,5 +1,27 @@ package com.eactive.eai.adapter.http.dynamic.impl; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.StopWatch; +import org.apache.mina.common.ByteBuffer; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.JSONValue; + import com.eactive.eai.adapter.AdapterGroupVO; import com.eactive.eai.adapter.AdapterManager; import com.eactive.eai.adapter.AdapterPropManager; @@ -8,8 +30,8 @@ import com.eactive.eai.adapter.Keys; import com.eactive.eai.adapter.http.HttpMemoryLogger; 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.UnkownMessageLogUtils; import com.eactive.eai.common.TransactionContextKeys; import com.eactive.eai.common.exception.ExceptionUtil; import com.eactive.eai.common.util.CommonLib; @@ -19,30 +41,6 @@ import com.eactive.eai.common.util.MessageUtil; import com.eactive.eai.env.ElinkConfig; import com.eactive.eai.inbound.processor.Processor; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.StopWatch; -import org.apache.hc.core5.http.ContentType; -import org.apache.mina.common.ByteBuffer; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; -import org.springframework.jms.support.converter.MessageType; - -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.net.URLDecoder; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.TreeMap; - public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport { public static final String PROPERTIES_NAME_HTTP_REQUEST_METHOD = "httpRequestMethod"; @@ -66,7 +64,8 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport AdapterGroupVO adapterGroupVo = null; Properties prop = null; - + byte[] requestBytes = null; + String encode = "MS949"; try { AdapterManager adapterManager = AdapterManager.getInstance(); AdapterVO adptVO = adapterManager.getAdapterVO(adptGrpName,adptName); @@ -78,9 +77,9 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport } Properties httpProp = manager.getProperties(adptVO.getPropGroupName()); + encode = StringUtils.defaultIfBlank(adapterManager.getAdapterGroupVO(adptGrpName).getMessageEncode(), "MS949"); String responseType = httpProp.getProperty(RESPONSE_TYPE,"SYNC"); String urlDecodeYn = httpProp.getProperty(URL_DECODE_YN,"N"); - String encode = StringUtils.defaultIfBlank(adapterManager.getAdapterGroupVO(adptGrpName).getMessageEncode(), "MS949"); String messageType = adapterManager.getAdapterGroupVO(adptGrpName).getMessageType(); String requestBodyYn = httpProp.getProperty(REQUEST_BODY_YN,"N"); String parameterName = httpProp.getProperty(PARAMETER_NAME,PARAMETER_MESSAGE); @@ -107,7 +106,6 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport logger.info("시작 >> encode = [" + encode + "]"); - byte[] requestBytes = null; if ("Y".equals(requestBodyYn)){ ServletInputStream sis = request.getInputStream(); @@ -191,19 +189,19 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport prop.put(PROPERTIES_NAME_HTTP_REQUEST_METHOD, request.getMethod()); prop.put(ALLOW_IP, httpProp.getProperty(ALLOW_IP, "")); - String body = new String ( requestBytes,encode); - - try { - Object root = JSONValue.parse(body); - if( root instanceof JSONArray ) { - JSONObject wrappedObject = new JSONObject(); - wrappedObject.put("DJB_ROOTLESS_ARRAY", root); - requestBytes = wrappedObject.toJSONString().getBytes(encode); - } - - }catch (Exception e) { - // ignore json이 아니기에 해줄것이 없음. - } +// String body = new String ( requestBytes,encode); +// +// try { +// Object root = JSONValue.parse(body); +// if( root instanceof JSONArray ) { +// JSONObject wrappedObject = new JSONObject(); +// wrappedObject.put("DJB_ROOTLESS_ARRAY", root); +// requestBytes = wrappedObject.toJSONString().getBytes(encode); +// } +// +// }catch (Exception e) { +// // ignore json이 아니기에 해줄것이 없음. +// } // 로컬 서비스 호출 Object result = null; @@ -338,7 +336,14 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport } } catch (Exception e) { - if (traceLevel >= 3){ + try { + UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, requestBytes != null ? new String(requestBytes, encode) : null, prop, request, response, + "RECEAIIRP202", e); + } catch (UnsupportedEncodingException e1) { + UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, requestBytes != null ? new String(requestBytes) : null, prop, request, response, + "RECEAIIRP202", e); + } + if (traceLevel >= 3){ HttpMemoryLogger.error(adptGrpName+adptName, e.toString(),e); } logger.error("HttpAdapter] "+adptGrpName+"-"+adptName, e);