From 1c139be54eccc9379a2fb984bfdeed7b8fb75fa9 Mon Sep 17 00:00:00 2001 From: cho Date: Tue, 27 Jan 2026 14:52:50 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=A0=EA=B0=9D=EC=9A=94=EA=B5=AC=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20TIM?= =?UTF-8?q?EOUT=EB=A7=8C=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20(HTTP=5FTIMEOUT=20=EB=AF=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9.=20=EB=8B=A8,=20token=EA=B1=B0=EB=9E=98(=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=A1=B4=EC=9E=AC?= =?UTF-8?q?=ED=95=98=EC=A7=80=EC=95=8A=EC=9D=8C)=20=EB=B0=9C=EA=B8=89?= =?UTF-8?q?=EC=9D=80=20=EC=96=B4=EB=8C=91=ED=84=B0=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=8D=BC=ED=8B=B0=EA=B0=92=20=EC=82=AC=EC=9A=A9.)=20=ED=83=80?= =?UTF-8?q?=EC=9E=84=EC=95=84=EC=9B=83=20=EA=B8=B0=EC=A4=80=EC=9D=84=20?= =?UTF-8?q?=EB=8B=A8=EC=9D=BC=ED=99=94=ED=95=98=EC=97=AC=20=EC=9A=B4?= =?UTF-8?q?=EC=98=81=20=ED=98=BC=EB=9E=80=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/client/HttpClient5AdapterServiceSupport.java | 8 +------- .../http/client/HttpClientAdapterServiceSupport.java | 3 ++- src/main/java/com/eactive/eai/outbound/HTTPProcess.java | 5 ++++- src/main/java/com/eactive/eai/outbound/RESTProcess.java | 5 ++++- src/main/java/com/eactive/eai/outbound/SocketProcess.java | 7 ++++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/eactive/eai/adapter/http/client/HttpClient5AdapterServiceSupport.java b/src/main/java/com/eactive/eai/adapter/http/client/HttpClient5AdapterServiceSupport.java index a212277..b81600f 100644 --- a/src/main/java/com/eactive/eai/adapter/http/client/HttpClient5AdapterServiceSupport.java +++ b/src/main/java/com/eactive/eai/adapter/http/client/HttpClient5AdapterServiceSupport.java @@ -99,7 +99,7 @@ public abstract class HttpClient5AdapterServiceSupport implements HttpClientAdap adapterHeader = prop.getProperty(ADAPTER_HEADER, ""); String traceLevelTemp = prop.getProperty(TRACE_LEVEL, "0"); - String timeoutTemp = prop.getProperty(HTTP_TIME_OUT, "0"); + String timeoutTemp = "10000"; // 타임아웃 기준이 불명확해 운영 혼란 발생 → 인터페이스 TIMEOUT으로 단일화 useMtls = StringUtils.equalsIgnoreCase(prop.getProperty(HttpClientAdapterServiceKey.USE_MTLS),"Y"); keyStorePath = prop.getProperty(HttpClientAdapterServiceKey.KEYSTORE_PATH); @@ -509,12 +509,6 @@ public abstract class HttpClient5AdapterServiceSupport implements HttpClientAdap requestConfigBuilder.setResponseTimeout(vo.getTimeout(), TimeUnit.MILLISECONDS); } - /* - if (HTTP_VERSION_1_1.equals(vo.getHttpVersion())) { - method.addHeader("Connection", "close"); - } - */ - org.apache.hc.core5.http.HttpVersion httpVersion ; if (HTTP_VERSION_1_0.equals(vo.getHttpVersion())) { httpVersion = org.apache.hc.core5.http.HttpVersion.HTTP_1_0; diff --git a/src/main/java/com/eactive/eai/adapter/http/client/HttpClientAdapterServiceSupport.java b/src/main/java/com/eactive/eai/adapter/http/client/HttpClientAdapterServiceSupport.java index 941a92b..5829cb0 100644 --- a/src/main/java/com/eactive/eai/adapter/http/client/HttpClientAdapterServiceSupport.java +++ b/src/main/java/com/eactive/eai/adapter/http/client/HttpClientAdapterServiceSupport.java @@ -83,7 +83,7 @@ public abstract class HttpClientAdapterServiceSupport implements HttpClientAdapt adapterHeader = prop.getProperty(ADAPTER_HEADER, ""); String traceLevelTemp = prop.getProperty(TRACE_LEVEL, "0"); - String timeoutTemp = prop.getProperty(HTTP_TIME_OUT); + String timeoutTemp = "10000";// 타임아웃 기준이 불명확해 운영 혼란 발생 → 인터페이스 TIMEOUT으로 단일화 useMtls = StringUtils.equalsIgnoreCase(prop.getProperty(HttpClientAdapterServiceKey.USE_MTLS), "Y"); keyStorePath = prop.getProperty(HttpClientAdapterServiceKey.KEYSTORE_PATH); @@ -116,6 +116,7 @@ public abstract class HttpClientAdapterServiceSupport implements HttpClientAdapt try { connectionTimeout = Integer.parseInt(connectionTimeoutTemp); } catch (Exception e) { + connectionTimeout = 3000; logger.debug("HttpClientAdapterSupport] connectionTimeoutTemp not int"); } try { diff --git a/src/main/java/com/eactive/eai/outbound/HTTPProcess.java b/src/main/java/com/eactive/eai/outbound/HTTPProcess.java index dd2c8ac..da67208 100644 --- a/src/main/java/com/eactive/eai/outbound/HTTPProcess.java +++ b/src/main/java/com/eactive/eai/outbound/HTTPProcess.java @@ -54,7 +54,10 @@ public class HTTPProcess extends DefaultProcess { protected final ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL); public void outboundCtrlCallServiceAsync() throws Exception { - // async에서는 인터페이스 값을 설정하지 않고 Adapter의 타임아웃을 쓰기위해서 설정하지 않음 + // 인터페이스에 셋팅된 타임아웃설정 + int iTimeoutValue = getTimeoutCodeToValue(); + this.timeout = iTimeoutValue * 1000; + this.tempProp.put(INTERFACE_TIME_OUT, "" + this.timeout); try { this.tempProp.put(HttpClientAdapterServiceKey.LOG_PROCESS_NO, this.logPssSno); this.resObject = HttpSender.callService(this.adapterGroupName, this.outboundProp, this.reqObject, this.tempProp); diff --git a/src/main/java/com/eactive/eai/outbound/RESTProcess.java b/src/main/java/com/eactive/eai/outbound/RESTProcess.java index f943a57..29bb60a 100644 --- a/src/main/java/com/eactive/eai/outbound/RESTProcess.java +++ b/src/main/java/com/eactive/eai/outbound/RESTProcess.java @@ -50,7 +50,10 @@ public class RESTProcess extends HTTPProcess { static final long serialVersionUID = 1L; public void outboundCtrlCallServiceAsync() throws Exception { - // async에서는 인터페이스 값을 설정하지 않고 Adapter의 타임아웃을 쓰기위해서 설정하지 않음 + // 인터페이스에 셋팅된 타임아웃설정 + int iTimeoutValue = getTimeoutCodeToValue(); + this.timeout = iTimeoutValue * 1000; + this.tempProp.put(INTERFACE_TIME_OUT, "" + this.timeout); try { this.tempProp.put(HttpClientAdapterServiceKey.LOG_PROCESS_NO, this.logPssSno); this.resObject = HttpSender.callService(this.adapterGroupName, this.outboundProp, this.reqObject, diff --git a/src/main/java/com/eactive/eai/outbound/SocketProcess.java b/src/main/java/com/eactive/eai/outbound/SocketProcess.java index 8b360e0..d3912f7 100644 --- a/src/main/java/com/eactive/eai/outbound/SocketProcess.java +++ b/src/main/java/com/eactive/eai/outbound/SocketProcess.java @@ -126,9 +126,10 @@ public class SocketProcess extends DefaultProcess { } public void outboundCtrlCallServiceAsync() throws Exception { - /** - * async에서는 인터페이스 값을 설정하지 않고 Adapter의 타임아웃을 쓰기위해서 설정하지 않음 - */ + // 인터페이스에 셋팅된 타임아웃설정 + int iTimeoutValue = getTimeoutCodeToValue(); + this.timeout = iTimeoutValue * 1000; + this.tempProp.put(INTERFACE_TIME_OUT, "" + this.timeout); try { this.resObject = SocketSender.callService(this.adapterGroupName, this.outboundProp, this.reqObject, this.tempProp);