DJBErpNsmapiAccessTokenService 토큰 만료시간 및 HTTP 클라이언트 재사용 수정

- 하드코딩된 30초 만료를 제거하고 oAuthCredentialVo.getIntervalSec() 기준으로
  복원 (미설정 시 24시간 폴백), 스케줄러 주기와 불일치하던 문제 해결
- execute() 호출마다 PoolingHttpClientConnectionManager/CloseableHttpClient를
  새로 만들고 즉시 닫던 것을, mTLS 여부+clientId 조합별로 1회만 생성해 재사용하도록
  변경. 이 서비스는 HttpClientAccessTokenServiceFactoryByDB에 싱글턴으로 캐시되어
  재사용되므로 인스턴스 필드로 안전하게 캐시 가능

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/dynamic/filter/EncrytTestFilter.java

@@ -37,12 +37,15 @@ public class EncrytTestFilter implements HttpAdapterFilter {
 			String jsonStr = null;
 			if (message instanceof String) {
 				jsonStr = (String) message;
-			} else if (message instanceof JSONObject) {
+			} else if (message instanceof ObjectNode) {
+				rootNode = (ObjectNode) message;
+			}  else if (message instanceof JSONObject) {
 				jsonStr = ((JSONObject) message).toJSONString();
 			} else {
 				return message;
 			}
-			rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr);
+			if(rootNode == null)
+				rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr);
 
 			// 1. HSM에서 키 가져오기
 			byte[] hsmKeyBytes = null;

src/main/java/com/eactive/eai/custom/authoutbound/client/impl/DJBErpNsmapiAccessTokenService.java

@@ -10,6 +10,7 @@ import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Date;
 import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.net.ssl.SSLContext;
 
@@ -62,6 +63,13 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
 
 	private static boolean testMode = TestModeChecker.isTestMode();
 
+	/**
+	 * mTLS 여부/clientId 조합별로 CloseableHttpClient(및 내부 PoolingHttpClientConnectionManager)를
+	 * 1회만 생성해 재사용한다. 이 서비스 인스턴스는 HttpClientAccessTokenServiceFactoryByDB에
+	 * className 기준으로 캐시되어 재사용되므로, 이 필드도 인스턴스 생명주기 동안 안전하게 재사용된다.
+	 */
+	private final ConcurrentHashMap<String, CloseableHttpClient> httpClientCache = new ConcurrentHashMap<>();
+
 	/**
 	 * 1. 기능 : 법인검증 토큰 발급에 사용 2. 처리 개요 : - 속성 정보를 설정 하고 토큰 발급 URL 호출 한다. 3. 주의사항
 	 *  - JSON 방식
@@ -121,80 +129,11 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
 			logger.info("adapterGroupName. : {}, useMtls. : {}, clientId : {}", name, useMtls, clientId);
 		}
 
-		int maxTotalConnections = HttpClientAdapterServiceKey.DEFAULT_MAX_TOTAL_CONNECTIONS;
-		int maxHostConnections = HttpClientAdapterServiceKey.DEFAULT_MAX_CONNECTION_PER_HOST;
-
-		HttpOutTlsInfoVO mtlsInfo = null;
-		SSLContext sslContext = null;
-		PoolingHttpClientConnectionManagerBuilder cmBuilder = PoolingHttpClientConnectionManagerBuilder.create();
-		PoolingHttpClientConnectionManager connectionManager = null;
-
-		try {
-			if (useMtls) {
-				HttpOutTlsInfoManager tlsManager = HttpOutTlsInfoManager.getInstance();
-				if (StringUtils.isNotEmpty(clientId)) {
-					mtlsInfo = tlsManager.getHttpOutTlsInfo(clientId);
-				}
-			}
-
-			if (useMtls && mtlsInfo != null) {
-				String storeType = mtlsInfo.getStoreType();
-				String keyStoreInfo = mtlsInfo.getKeystoreInfo();
-				String keyStorePassword = mtlsInfo.getKeystorePassword();
-				String trustStoreInfo = mtlsInfo.getTruststoreInfo();
-				String trustStorePassword = mtlsInfo.getTruststorePassword();
-
-				String[] tlsVersions = null;
-				String[] cipherSuites = null;
-
-				if (StringUtils.isAnyEmpty(keyStoreInfo, keyStorePassword)) {
-					throw new Exception("mTLS keyStore config error");
-				}
-
-				boolean skipTrust = false;
-				if (StringUtils.isAnyEmpty(trustStoreInfo, trustStorePassword)) {
-					if (logger.isWarn())
-						logger.warn("Skip trustStore validation adapterGroupName : " + name);
-					skipTrust = true;
-				}
-
-				sslContext = HttpClient5SSLContextFactory.createMTLSContextFromContent(storeType, keyStoreInfo,
-						keyStorePassword, trustStoreInfo, trustStorePassword, skipTrust, tlsVersions, cipherSuites);
-
-				SSLConnectionSocketFactory sslSocketFactory = null;
-				if (testMode) {
-					sslSocketFactory = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
-				} else {
-					sslSocketFactory = new SSLConnectionSocketFactory(sslContext);
-				}
-				cmBuilder.setSSLSocketFactory(sslSocketFactory);
-			} else {
-				sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
-				SSLConnectionSocketFactory sslSocketFactory = null;
-		        if(testMode) {
-		        	// Hostname verifier 비활성화 (테스트용)
-					sslSocketFactory = new SSLConnectionSocketFactory(
-					    sslContext
-					    , NoopHostnameVerifier.INSTANCE 
-					);
-		        }
-		        else {
-		        	sslSocketFactory = new SSLConnectionSocketFactory(
-						    sslContext						  
-						);
-		        }
-		        cmBuilder.setSSLSocketFactory(sslSocketFactory);
-			}
-		} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
-				| IOException | UnrecoverableKeyException e) {
-			throw new RuntimeException(e);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-
-		connectionManager = cmBuilder.build();
-		connectionManager.setMaxTotal(maxTotalConnections);
-		connectionManager.setDefaultMaxPerRoute(maxHostConnections);
+		// mTLS 여부(및 clientId)별로 CloseableHttpClient를 재사용한다. 매 호출마다 새로 만들면
+		// PoolingHttpClientConnectionManager를 쓰는 의미가 없어지고 SSL 핸드셰이크 비용만 반복된다.
+		String httpClientCacheKey = useMtls ? "mtls:" + clientId : "default";
+		CloseableHttpClient httpClient = httpClientCache.computeIfAbsent(httpClientCacheKey,
+				key -> buildHttpClient(useMtls, clientId, name));
 
 		//json body setting
 //		Map<String,Object> jsonMap = new HashMap<>();
@@ -203,7 +142,7 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
 //		ObjectMapper objMapper = new ObjectMapper();
 //		String authJsonBody = objMapper.writeValueAsString(jsonMap);
 
-		try (CloseableHttpClient httpClient = HttpClients.custom().setConnectionManager(connectionManager).build();) {
+		{
 			HttpPost httpPost = new HttpPost(uri);
 //			httpPost.setEntity(new StringEntity(authJsonBody));
 			httpPost.setHeader("Content-Type", contentType+" charset=" + encode);
@@ -264,11 +203,14 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
 					
 					if (responseJSON.has("data")) {
 						JsonNode data = responseJSON.path("data");
-						if(data.has("token")) {
-							String token = data.path("token").asText();
+						if(data.has("access_token")) {
+							String token = data.path("access_token").asText();
+							long intervalSec = oAuthCredentialVo.getIntervalSec() > 0
+									? oAuthCredentialVo.getIntervalSec()
+									: 24 * 60 * 60;
 							accessToken = new OAuth2AccessTokenVO();
 							accessToken.setAccessToken(token);
-							accessToken.setExpiration(new Date(currentTime + 30_000L));
+							accessToken.setExpiration(new Date(currentTime + intervalSec * 1000L));
 							logger.debug("oauthToken =" + accessToken.toString());
 							return accessToken;
 						} else {
@@ -277,8 +219,6 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
 					} else {
 						throw new Exception("oauth token return null");
 					}
-//					accessToken.setExpiration(new Date(currentTime + oAuthCredentialVo.getIntervalSec() * 1000L));
-					
 				} else {
 					throw new Exception("oauth token return null");
 				}
@@ -289,6 +229,94 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
 		}
 	}
 
+	/**
+	 * mTLS 여부/clientId 조합에 맞는 SSLContext로 PoolingHttpClientConnectionManager와
+	 * CloseableHttpClient를 생성한다. httpClientCache에 의해 조합당 1회만 호출되며, 반환된
+	 * CloseableHttpClient는 재사용을 위해 닫지 않는다(닫으면 커넥션 풀이 함께 종료된다).
+	 */
+	private CloseableHttpClient buildHttpClient(boolean useMtls, String clientId, String adapterGroupName) {
+		int maxTotalConnections = HttpClientAdapterServiceKey.DEFAULT_MAX_TOTAL_CONNECTIONS;
+		int maxHostConnections = HttpClientAdapterServiceKey.DEFAULT_MAX_CONNECTION_PER_HOST;
+
+		HttpOutTlsInfoVO mtlsInfo = null;
+		SSLContext sslContext = null;
+		PoolingHttpClientConnectionManagerBuilder cmBuilder = PoolingHttpClientConnectionManagerBuilder.create();
+
+		try {
+			if (useMtls) {
+				HttpOutTlsInfoManager tlsManager = HttpOutTlsInfoManager.getInstance();
+				if (StringUtils.isNotEmpty(clientId)) {
+					mtlsInfo = tlsManager.getHttpOutTlsInfo(clientId);
+				}
+			}
+
+			if (useMtls && mtlsInfo != null) {
+				String storeType = mtlsInfo.getStoreType();
+				String keyStoreInfo = mtlsInfo.getKeystoreInfo();
+				String keyStorePassword = mtlsInfo.getKeystorePassword();
+				String trustStoreInfo = mtlsInfo.getTruststoreInfo();
+				String trustStorePassword = mtlsInfo.getTruststorePassword();
+
+				String[] tlsVersions = null;
+				String[] cipherSuites = null;
+
+				if (StringUtils.isAnyEmpty(keyStoreInfo, keyStorePassword)) {
+					throw new Exception("mTLS keyStore config error");
+				}
+
+				boolean skipTrust = false;
+				if (StringUtils.isAnyEmpty(trustStoreInfo, trustStorePassword)) {
+					if (logger.isWarn())
+						logger.warn("Skip trustStore validation adapterGroupName : " + adapterGroupName);
+					skipTrust = true;
+				}
+
+				sslContext = HttpClient5SSLContextFactory.createMTLSContextFromContent(storeType, keyStoreInfo,
+						keyStorePassword, trustStoreInfo, trustStorePassword, skipTrust, tlsVersions, cipherSuites);
+
+				SSLConnectionSocketFactory sslSocketFactory = null;
+				if (testMode) {
+					sslSocketFactory = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+				} else {
+					sslSocketFactory = new SSLConnectionSocketFactory(sslContext);
+				}
+				cmBuilder.setSSLSocketFactory(sslSocketFactory);
+			} else {
+				sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
+				SSLConnectionSocketFactory sslSocketFactory = null;
+		        if(testMode) {
+		        	// Hostname verifier 비활성화 (테스트용)
+					sslSocketFactory = new SSLConnectionSocketFactory(
+					    sslContext
+					    , NoopHostnameVerifier.INSTANCE
+					);
+		        }
+		        else {
+		        	sslSocketFactory = new SSLConnectionSocketFactory(
+						    sslContext
+						);
+		        }
+		        cmBuilder.setSSLSocketFactory(sslSocketFactory);
+			}
+		} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
+				| IOException | UnrecoverableKeyException e) {
+			throw new RuntimeException(e);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+
+		PoolingHttpClientConnectionManager connectionManager = cmBuilder.build();
+		connectionManager.setMaxTotal(maxTotalConnections);
+		connectionManager.setDefaultMaxPerRoute(maxHostConnections);
+
+		if (logger.isInfo()) {
+			logger.info("DJBErpNsmapiAccessTokenService] HttpClient(재사용) 생성. adapterGroupName={}, useMtls={}, clientId={}",
+					adapterGroupName, useMtls, clientId);
+		}
+
+		return HttpClients.custom().setConnectionManager(connectionManager).build();
+	}
+
 	/**
 	 * URL에 경로를 추가합니다. 중복되는 슬래시를 방지합니다.
 	 *