djb-eapim/elink-online-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

개발서버 confict 해결

Browse Source
This commit is contained in:
25W0075
2025-11-19 19:02:45 +09:00
parent 77a6be65e9 29eb510e68
commit ea88072f0a
7 changed files with 2470 additions and 2424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
+1398 -1355
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceKey.java
+84 -83
View File
@@ -1,83 +1,84 @@
package com.eactive.eai.adapter.http.dynamic; package com.eactive.eai.adapter.http.dynamic;
public interface HttpAdapterServiceKey { public interface HttpAdapterServiceKey {
// URL 파리미터 DEFAULT 이름 // URL 파리미터 DEFAULT 이름
static final String PARAMETER_MESSAGE = "_message_"; static final String PARAMETER_MESSAGE = "_message_";
// URL 파리미터 이름 // URL 파리미터 이름
static final String PARAMETER_NAME = "PARAMETER_NAME"; static final String PARAMETER_NAME = "PARAMETER_NAME";
// Http Adapter 이름 // Http Adapter 이름
static final String HTTP_ADAPTER_NAME = "HTTP_ADAPTER_NAME"; static final String HTTP_ADAPTER_NAME = "HTTP_ADAPTER_NAME";
// Http Adapter Group 이름 // Http Adapter Group 이름
static final String HTTP_ADAPTER_GROUP_NAME = "HTTP_ADAPTER_GROUP_NAME"; static final String HTTP_ADAPTER_GROUP_NAME = "HTTP_ADAPTER_GROUP_NAME";
// Http Response Type 이름 // Http Response Type 이름
static final String RESPONSE_TYPE = "RESPONSE_TYPE"; static final String RESPONSE_TYPE = "RESPONSE_TYPE";
public static final String RESPONSE_TYPE_SYNC = "SYNC"; public static final String RESPONSE_TYPE_SYNC = "SYNC";
public static final String RESPONSE_TYPE_ASYNC = "ASYN"; public static final String RESPONSE_TYPE_ASYNC = "ASYN";
// Http Encode 이름 // Http Encode 이름
static final String ENCODE = "ENCODE"; static final String ENCODE = "ENCODE";
// Http URL Decode 여부 // Http URL Decode 여부
static final String URL_DECODE_YN = "URL_DECODE_YN"; static final String URL_DECODE_YN = "URL_DECODE_YN";
// Body data 사용 여부 // Body data 사용 여부
static final String REQUEST_BODY_YN = "REQUEST_BODY_YN"; static final String REQUEST_BODY_YN = "REQUEST_BODY_YN";
// 삭제할 데이타 길이 // 삭제할 데이타 길이
static final String REMOVE_LENGTH = "REMOVE_LENGTH"; static final String REMOVE_LENGTH = "REMOVE_LENGTH";
// 추가할 데이타 // 추가할 데이타
static final String ADD_DATA = "ADD_DATA"; static final String ADD_DATA = "ADD_DATA";
// 거래 로그 // 거래 로그
static final String TRACE_LEVEL = "TRACE_LEVEL"; static final String TRACE_LEVEL = "TRACE_LEVEL";
static final String ERROR_RESPONSE_FORMAT = "ERROR_RESPONSE_FORMAT"; static final String ERROR_RESPONSE_FORMAT = "ERROR_RESPONSE_FORMAT";
// REST용 전달값 // REST용 전달값
static final String INBOUND_METHOD = "INBOUND_METHOD"; static final String INBOUND_METHOD = "INBOUND_METHOD";
static final String INBOUND_URI = "INBOUND_URI"; static final String INBOUND_URI = "INBOUND_URI";
static final String INBOUND_EXTURI = "INBOUND_EXTURI"; static final String INBOUND_EXTURI = "INBOUND_EXTURI";
static final String INBOUND_HEADER = "INBOUND_HEADER"; static final String INBOUND_HEADER = "INBOUND_HEADER";
static final String INBOUND_QUERY_STRING = "INBOUND_QUERY_STRING"; static final String INBOUND_QUERY_STRING = "INBOUND_QUERY_STRING";
static final String INBOUND_REWRITE_PATH = "INBOUND_REWRITE_PATH"; static final String INBOUND_REWRITE_PATH = "INBOUND_REWRITE_PATH";
static final String INBOUND_REMOTE_ADDR = "INBOUND_REMOTE_ADDR"; static final String INBOUND_REMOTE_ADDR = "INBOUND_REMOTE_ADDR";
static final String INBOUND_SCHEME = "INBOUND_SCHEME"; static final String INBOUND_SCHEME = "INBOUND_SCHEME";
static final String INBOUND_PATH_VARIABLES = "INBOUND_PATH_VARIABLES"; static final String INBOUND_PATH_VARIABLES = "INBOUND_PATH_VARIABLES";
static final String INBOUND_REQUEST_MESSAGE = "INBOUND_REQUEST_MESSAGE"; static final String INBOUND_REQUEST_MESSAGE = "INBOUND_REQUEST_MESSAGE";
static final String INBOUND_CLIENT_IP = "INBOUND_CLIENT_IP"; static final String INBOUND_CLIENT_IP = "INBOUND_CLIENT_IP";
static final String INBOUND_SYNC_ASYNC_TYPE = "INBOUND_SYNC_ASYNC_TYPE"; static final String INBOUND_SYNC_ASYNC_TYPE = "INBOUND_SYNC_ASYNC_TYPE";
public static final String OUTBOUND_RESPONSE_HEADERS = "OUTBOUND_RESPONSE_HEADERS"; public static final String OUTBOUND_RESPONSE_HEADERS = "OUTBOUND_RESPONSE_HEADERS";
public static final String OUTBOUND_RESPONSE_MESSAGE = "OUTBOUND_RESPONSE_MESSAGE"; public static final String OUTBOUND_RESPONSE_MESSAGE = "OUTBOUND_RESPONSE_MESSAGE";
public static final String OUTBOUND_RESPONSE_STATUS = "OUTBOUND_RESPONSE_STATUS"; public static final String OUTBOUND_RESPONSE_STATUS = "OUTBOUND_RESPONSE_STATUS";
public static final String OUTBOUND_PROPERTY_MAP = "OUTBOUND_PROPERTY_MAP"; public static final String OUTBOUND_PROPERTY_MAP = "OUTBOUND_PROPERTY_MAP";
// API path // API path
static final String API_PATH = "API_PATH"; static final String API_PATH = "API_PATH";
// 요청전 수행할 필터(쉼표(,)로 구분) // 요청전 수행할 필터(쉼표(,)로 구분)
static final String PRE_FILTERS = "PRE_FILTERS"; static final String PRE_FILTERS = "PRE_FILTERS";
// 요청후 수행할 필터(쉼표(,)로 구분) // 요청후 수행할 필터(쉼표(,)로 구분)
static final String POST_FILTERS = "POST_FILTERS"; static final String POST_FILTERS = "POST_FILTERS";
static final String ALLOW_IP = "ALLOW_IP"; static final String ALLOW_IP = "ALLOW_IP";
static final String ENC_PATHS = "ENC_PATHS"; static final String ENC_PATHS = "ENC_PATHS";
static final String ENCRYPT_ALGORITHM = "ENCRYPT_ALGORITHM"; //jwhong static final String ENCRYPT_ALGORITHM = "ENCRYPT_ALGORITHM"; //jwhong
static final String INBOUND_TOKEN = "authorization"; // jwhong static final String INBOUND_TOKEN = "authorization"; // jwhong
static final String ENCRYPT_BASE_TYPE = "ENCRYPT_BASE_TYPE"; // jwhong static final String ENCRYPT_BASE_TYPE = "ENCRYPT_BASE_TYPE"; // jwhong
static final String ENCRYPT_AES256_IV = "ENCRYPT_AES256_IV"; // jwhong static final String ENCRYPT_AES256_IV = "ENCRYPT_AES256_IV"; // jwhong
static final String ENCRYPT_AES256_KEY = "ENCRYPT_AES256_KEY"; // jwhong static final String ENCRYPT_AES256_KEY = "ENCRYPT_AES256_KEY"; // jwhong
static final String INBOUND_REQUESTED_TIME = "INBOUND_REQUESTED_TIME"; // jwhong
//응답 처리 용 표준 전문 오브젝트
static final String STANDARD_MESSAGE_OBJECT = "STANDARD_MESSAGE_OBJECT"; //응답 처리 용 표준 전문 오브젝트
} static final String STANDARD_MESSAGE_OBJECT = "STANDARD_MESSAGE_OBJECT";
}
src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64Header.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.eactive.eai.authoutbound.client.impl; package com.eactive.eai.authoutbound.client.impl;
import com.eactive.eai.adapter.AdapterGroupVO; import com.eactive.eai.adapter.AdapterGroupVO;
import com.eactive.eai.adapter.AdapterManager; import com.eactive.eai.adapter.AdapterManager;
import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey; import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
src/main/java/com/eactive/eai/common/logger/EAILogDAO.java
+982 -982
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/eactive/eai/common/util/JMSSender.java
+2 -1
View File
@@ -1,5 +1,5 @@
package com.eactive.eai.common.util; package com.eactive.eai.common.util;
import java.util.Iterator; import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
@@ -69,6 +69,7 @@ public class JMSSender {
throw new Exception("qconFactory not found -" + connectionFactory); throw new Exception("qconFactory not found -" + connectionFactory);
queue = locator.getQueue(destination); queue = locator.getQueue(destination);
logger.info("resolved quene name is:" + "["+ queue + "]");
qsender = qsession.createSender(queue); qsender = qsession.createSender(queue);
ObjectMessage msg = qsession.createObjectMessage(); ObjectMessage msg = qsession.createObjectMessage();
src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java
+1 -1
View File
@@ -58,7 +58,7 @@ import org.json.simple.JSONObject;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
//import org.apache.commons.lang3.StringUtils; //import org.apache.commons.lang3.StringUtils;
//import org.springframework.http.HttpStatus; //import org.springframework.http.HttpStatus;
//import java.util.Calendar; //import java.util.Calendar;
//import java.util.Properties; //import java.util.Properties;
src/main/java/com/eactive/eai/outbound/RESTProcess.java
+2 -1
View File
@@ -1,5 +1,5 @@
package com.eactive.eai.outbound; package com.eactive.eai.outbound;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.util.Properties; import java.util.Properties;
@@ -439,6 +439,7 @@ public class RESTProcess extends HTTPProcess {
PropertiesUtil.copyPropertyIfPresent(this.callProp, this.tempProp, HttpAdapterServiceKey.INBOUND_PATH_VARIABLES); PropertiesUtil.copyPropertyIfPresent(this.callProp, this.tempProp, HttpAdapterServiceKey.INBOUND_PATH_VARIABLES);
PropertiesUtil.copyPropertyIfPresent(this.callProp, this.tempProp, HttpAdapterServiceKey.INBOUND_REMOTE_ADDR); PropertiesUtil.copyPropertyIfPresent(this.callProp, this.tempProp, HttpAdapterServiceKey.INBOUND_REMOTE_ADDR);
PropertiesUtil.copyPropertyIfPresent(this.callProp, this.tempProp, HttpAdapterServiceKey.INBOUND_SCHEME); PropertiesUtil.copyPropertyIfPresent(this.callProp, this.tempProp, HttpAdapterServiceKey.INBOUND_SCHEME);
PropertiesUtil.copyPropertyIfPresent(this.callProp, this.tempProp, HttpAdapterServiceKey.INBOUND_REQUESTED_TIME); // jwhong
String svcName = getServiceId(this.reqEaiMsg); String svcName = getServiceId(this.reqEaiMsg);
if (svcName == null) { if (svcName == null) {