미확인 오류 로그 출력 수정 및 favicon.ico 처리하지않도록 변경

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<String> 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<String> 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<String> 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,

src/main/java/com/eactive/eai/adapter/service/DJBApiAdapterService.java

@@ -154,6 +154,8 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
         transactionProp.put(HEADER_GROUP, headerGroupName);
         transactionProp.put(HEADER_KEYS, relayRequestHeaderKeys);
         
+        transactionProp.put(ADAPTER_TOKEN_HEADER_NAME, httpProp.getProperty(ADAPTER_TOKEN_HEADER_NAME, ""));  // OAuth 인증 토큰 헤더 이름
+        transactionProp.put(ADAPTER_APIKEY_HEADER_NAME, httpProp.getProperty(ADAPTER_APIKEY_HEADER_NAME, ""));  // API-KEY 인증 헤더 이름
         // SEED 컬럼암호하 시  Key로 사용함
         String seedkey = inboundHeaderProp.getOrDefault("x-obp-partnercode", "").toString();
         ElinkTransactionContext.setSeedKey(seedkey);

src/main/java/com/eactive/eai/custom/adapter/http/client/impl/HttpClient5AdapterServiceBigTech.java

@@ -14,6 +14,7 @@ import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
 import com.eactive.eai.adapter.http.client.impl.HttpClient5AdapterServiceRest;
 import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.MaskingUtils;
 
 /**
  * 1. 기능 : EAI HTTP OutBound 용 어댑터로 수동 시스템의 HTTP 웹 컴포넌트를 GET/POST 방식으로 호출할 수 있는
@@ -79,13 +80,21 @@ public class HttpClient5AdapterServiceBigTech extends HttpClient5AdapterServiceR
 			String adapterGroupName = tempProp.getProperty(ADAPTER_GROUP_NAME);
 			Properties customProp = PropManager.getInstance().getProperties(adapterGroupName);
 			String charset = customProp.getProperty("_BTP_CHARSET", _BTP_CHARSET);
-			String alorithm = customProp.getProperty("_BTP_ALGORITHM", _BTP_ALGORITHM);
+			String algorithm = customProp.getProperty("_BTP_ALGORITHM", _BTP_ALGORITHM);
 			String timestamp = System.currentTimeMillis() + "";
 			String accessKey = customProp.getProperty("_BTP_ACCESS_KEY", _BTP_ACCESS_KEY);
 			String secretKey = customProp.getProperty("_BTP_SECRET_KEY", _BTP_SECRET_KEY);
+			if(logger.isDebug()) {
+				logger.debug("charset={}", charset);
+				logger.debug("algorithm={}", algorithm);
+				logger.debug("timestamp={}", timestamp);
+				logger.debug("accessKey={}", accessKey);
+				logger.debug("secretKey={}", MaskingUtils.maskPassword(secretKey));
+				logger.debug("url={}", method.getRequestUri());
+			}
 			
 			String signature = macHex(charset// charset
-					, alorithm// algorithm
+					, algorithm// algorithm
 					, timestamp// timestamp
 					, accessKey// accessKey
 					, secretKey// secretKey
@@ -100,28 +109,28 @@ public class HttpClient5AdapterServiceBigTech extends HttpClient5AdapterServiceR
 		}
 	}
 	
-	public static void main(String[] args) {
+//	public static void main(String[] args) {
-        try {
+//        try {
-            String url = "/rest/v1/service?param0=&param1=";
+//            String url = "/rest/v1/service?param0=&param1=";
-            String timestamp = System.currentTimeMillis()+"";
+//            String timestamp = System.currentTimeMillis()+"";
-            String accessKey = _BTP_ACCESS_KEY;
+//            String accessKey = _BTP_ACCESS_KEY;
-            String secretKey = _BTP_SECRET_KEY;
+//            String secretKey = _BTP_SECRET_KEY;
-            String signature = macHex(
+//            String signature = macHex(
-            	  _BTP_CHARSET//charset
+//            	  _BTP_CHARSET//charset
-                , _BTP_ALGORITHM//algorithm
+//                , _BTP_ALGORITHM//algorithm
-                , timestamp// timestamp
+//                , timestamp// timestamp
-                , _BTP_ACCESS_KEY//accessKey
+//                , _BTP_ACCESS_KEY//accessKey
-                , _BTP_SECRET_KEY//secretKey
+//                , _BTP_SECRET_KEY//secretKey
-                , url
+//                , url
-            );
+//            );
-            System.out.println(String.format("charset=%s", _BTP_CHARSET));
+//            System.out.println(String.format("charset=%s", _BTP_CHARSET));
-            System.out.println(String.format("algorithm=%s", _BTP_ALGORITHM));
+//            System.out.println(String.format("algorithm=%s", _BTP_ALGORITHM));
-            System.out.println(String.format("accessKey=%s", accessKey));
+//            System.out.println(String.format("accessKey=%s", accessKey));
-            System.out.println(String.format("secretKey=%s", secretKey));
+//            System.out.println(String.format("secretKey=%s", secretKey));
-            System.out.println(String.format("timestamp=%s", timestamp));
+//            System.out.println(String.format("timestamp=%s", timestamp));
-            System.out.println(String.format("signature=%s", signature));
+//            System.out.println(String.format("signature=%s", signature));
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            e.printStackTrace();
+//            e.printStackTrace();
-        }
+//        }
-    }// end of main
+//    }// end of main
 }

src/main/java/com/eactive/eai/custom/adapter/http/client/impl/HttpClient5AdapterServiceBigTechAddFilter.java

@@ -0,0 +1,147 @@
+package com.eactive.eai.custom.adapter.http.client.impl;
+
+import java.util.Properties;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dom4j.Node;
+import org.json.simple.JSONObject;
+
+import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
+import com.eactive.eai.adapter.http.client.impl.filter.HttpClient5AdapterFilterFactory;
+import com.eactive.eai.adapter.http.client.impl.filter.HttpClientAdapterFilter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * 1. 기능 : HttpClient5AdapterServiceRest 호출 전후 Filter 적용할 수 있는 기능을 제공한다.<br>
+ * 2. 처리 개요 : <br>
+ * 3. 주의사항 <br>
+ *
+ * @author :
+ * @version : v 1.0.0
+ * @see : HttpClientAdapterServiceFactory.java,
+ *      HttpClientAdapterServiceSupport.java, HttpClient5AdapterServiceRest.java
+ * @since :
+ * 
+ */
+public class HttpClient5AdapterServiceBigTechAddFilter extends HttpClient5AdapterServiceBigTech
+		implements HttpClientAdapterServiceKey {
+
+	// 요청전 수행할 필터(쉼표(,)로 구분)
+	static final String PRE_FILTERS = "PRE_FILTERS";
+
+	// 요청후 수행할 필터(쉼표(,)로 구분)
+	static final String POST_FILTERS = "POST_FILTERS";
+
+//	// Adapter에서 Exception이 발생한 경우, 처리할 필터
+//	static final String EXCEPTION_FILTER = "EXCEPTION_FILTER";
+
+	private ObjectMapper mapper = new ObjectMapper();
+	
+	/**
+	 * 1. 기능 : HttpClient 호출 전후 Filter 적용용 2. 처리 개요 : <br>
+	 * 3. 주의사항 <br>
+	 *
+	 * @param prop Http Adapter 속성 정보
+	 * @return 반환 된 Object
+	 * @exception Exception 수동 시스템 간 통신 중 발생
+	 */
+	public Object execute(Properties prop, Object data, Properties tempProp) throws Exception {
+
+		String adptGrpName = tempProp.getProperty(ADAPTER_GROUP_NAME);
+		String adptName = tempProp.getProperty(ADAPTER_NAME);
+
+		data = doPreFilters(adptGrpName, adptName, prop, data, tempProp);
+
+		Object adapterResponse = super.execute(prop, data, tempProp);
+
+		adapterResponse = doPostFilters(adptGrpName, adptName, prop, adapterResponse, tempProp);
+		if (adapterResponse instanceof JSONObject)
+			adapterResponse = ((JSONObject) adapterResponse).toJSONString();
+		else if (adapterResponse instanceof ObjectNode)
+			adapterResponse = mapper.writeValueAsString((ObjectNode) adapterResponse);
+		else if (adapterResponse instanceof Node)
+			adapterResponse = ((Node) adapterResponse).asXML();
+
+		return adapterResponse;
+	}
+
+	protected Object doPreFilters(String adptGrpName, String adptName, Properties prop, Object message,
+			Properties tempProp) throws Exception {
+
+//		boolean isSetCommonFilterInAdapterProp = false;
+		// 1. adapter에 설정된 필터 수행
+		String preFiltersStr = prop.getProperty(PRE_FILTERS);
+		if (StringUtils.isNotEmpty(preFiltersStr)) {
+			String[] preFilters = StringUtils.split(preFiltersStr, ",");
+			for (String filterName : preFilters) {
+				if (StringUtils.isBlank(filterName)) {
+					continue;
+				}
+
+				logger.debug("HttpClient5AdapterServiceRestAddFilter] Processing Start [" + filterName + "]");
+				HttpClientAdapterFilter adapterFilter = HttpClient5AdapterFilterFactory.createFilter(filterName.trim());
+
+				if (adapterFilter != null) {
+//					if (adapterFilter instanceof IBKOutCommonFilter)
+//						isSetCommonFilterInAdapterProp = true;
+
+					message = adapterFilter.doPreFilter(adptGrpName, adptName, prop, message, tempProp);
+				} else {
+					throw new Exception("Failed get Filter Class: " + filterName);
+				}
+			}
+		}
+
+//		// 2. IBKOutCommonFilter 필터 수행(adapter 필터에서 수행하지 않을 때만)
+//		if (!isSetCommonFilterInAdapterProp) {
+//			HttpClientAdapterFilter ibkFilter = HttpClient5AdapterFilterFactory
+//					.createFilter(IBKOutCommonFilter.class.getName());
+//			if (ibkFilter != null) {
+//				message = ibkFilter.doPreFilter(adptGrpName, adptName, prop, message, tempProp);
+//			}
+//		} else {
+//			logger.debug("IBKOutCommonFilter isSetCommonFilterInAdapterProp 'POST_FILTERS'. already in adapter filters");
+//		}
+
+		return message;
+	}
+
+	protected Object doPostFilters(String adptGrpName, String adptName, Properties prop, Object message,
+			Properties tempProp) throws Exception {
+
+//		boolean isSetCommonFilterInAdapterProp = false;
+		// 1. adapter에 설정된 필터 수행
+		String postFiltersStr = prop.getProperty(POST_FILTERS);
+		if (StringUtils.isNotEmpty(postFiltersStr)) {
+			String[] postFilters = StringUtils.split(postFiltersStr, ",");
+			for (String filterName : postFilters) {
+				if (StringUtils.isBlank(filterName)) {
+					continue;
+				}
+
+				HttpClientAdapterFilter adapterFilter = HttpClient5AdapterFilterFactory.createFilter(filterName.trim());
+				if (adapterFilter != null) {
+//					if (adapterFilter instanceof IBKOutCommonFilter)
+//						isSetCommonFilterInAdapterProp = true;
+					message = adapterFilter.doPostFilter(adptGrpName, adptName, prop, message, tempProp);
+				} else {
+					throw new Exception("Failed get Filter Class: " + filterName);
+				}
+			}
+		}
+
+//		// 2. IBKOutCommonFilter 필터 수행
+//		if (!isSetCommonFilterInAdapterProp) {
+//			HttpClientAdapterFilter ibkFilter = HttpClient5AdapterFilterFactory
+//					.createFilter(IBKOutCommonFilter.class.getName());
+//			if (ibkFilter != null) {
+//				message = ibkFilter.doPostFilter(adptGrpName, adptName, prop, message, tempProp);
+//			}
+//		} else {
+//			logger.debug("IBKOutCommonFilter isSetCommonFilterInAdapterProp 'PRE_FILTERS'. already in adapter filters");
+//		}
+		return message;
+	}
+
+}