diff --git a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
index 751abe7..c9e1904 100644
--- a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
+++ b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
@@ -167,9 +167,6 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		String messageType = prop.getProperty("MESSAGE_TYPE", MessageType.JSON);
 		String inboundMethod = tempProp.getProperty(HttpAdapterServiceKey.INBOUND_METHOD, "POST");
 		
-		//Outbound 요청에 대한 응답 메시지의 복호화 여부 결정위해 jwhong
-		encryptResponseApply = StringUtils.equalsIgnoreCase(prop.getProperty("ENCRYPT_RESPONSE_APPLY", "N"), "Y");
-		
 		//Outbound 요청에 대한 응답 메시지의 복호화 여부 결정위해
 		encryptResponseApply = StringUtils.equalsIgnoreCase(prop.getProperty("ENCRYPT_RESPONSE_APPLY", "N"), "Y");
 
@@ -812,11 +809,21 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		//weblogic 에서는 tempProp.get 이 property로 return 해어 아래처럼 수정함. ClassCastException 발생함.
 		//Properties inboundHeaders = (Properties) tempProp.get(HttpAdapterServiceKey.INBOUND_HEADER);
 		Properties inboundHeaders = null;
+		String authorization = "";
 		String authorization ="";
 		try {
 			Object headerObj = tempProp.get(HttpAdapterServiceKey.INBOUND_HEADER);
+			System.out.println("*** inboundheader Ojb:"+headerObj);
 			if (headerObj instanceof Properties) {    //tomcat
 				inboundHeaders = (Properties) headerObj;
+				System.out.println("*** inboundHeaders tomcat:"+inboundHeaders);
+				for (String k : inboundHeaders.stringPropertyNames()) {
+					System.out.println("*** inboundheader k is:"+k);
+					if (k.equalsIgnoreCase("authorization")) {
+						authorization = inboundHeaders.getProperty(k);
+						break;
+					}
+				}
 				for ( String k : inboundHeaders.stringPropertyNames()) {
 					if(k.equalsIgnoreCase("authorization")) {
 						authorization = inboundHeaders.getProperty(k);
@@ -825,25 +832,26 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 				}
 			} else if (headerObj instanceof String) {  //weblogic
 				String str = (String) headerObj;
+				System.out.println("*** inboundHeaders weblogic str:"+str);
 				str = str.substring(1, str.length() - 1);
-				// 2. key=value 쌍 분리
+				
 				String[] entries = str.split(",");
-				// map에 담기
+				
 				Map<String, String> map = new HashMap<>();
 				for (String entry : entries) {
-				    String[] kv = entry.split("=", 2);
-				    if (kv.length == 2) {
-				        map.put(kv[0].trim(), kv[1].trim());
-				    }
-				}
-				for (String k : map.keySet()) {
-				    if (k.equalsIgnoreCase("authorization")) {
-				    	authorization = map.get(k);
-				        break;
-				    }
+					String[] kv = entry.split("=", 2);
+					if (kv.length == 2) {
+						map.put( kv[0].trim(), kv[1].trim());
+					}
 				}
+				for (String k : map.keySet() ) {
+					if ( k.equalsIgnoreCase("authorization")) {
+						authorization = map.get(k);
+						break;
+					}
+				}		
 			}	
-		} catch (Exception  e) {
+		} catch (Exception e) {
 		    e.printStackTrace();
 		}
 		
@@ -853,9 +861,13 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		    jwtToken = authorization.substring(7); // "Bearer " 이후의 JWT만 추출
 		}
 		
+		System.out.println("*** authorization is:"+authorization);
+		System.out.println("*** jwtToken is:"+jwtToken);
+		
 		/* 업체정보 */
         String clientId = JwtClientIdExtractor(jwtToken);
         method.setHeader("clientId", clientId);
+        System.out.println("*** header clientID biz company code:"+clientId);
         
         /* APIM 거래추적자 */
         String uuid = tempProp.getProperty(TransactionContextKeys.TRANSACTION_UUID, "");
@@ -947,7 +959,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		return responseMessage;
 		
 	}
-	private String doOutboundPreEncrypt(Object eaiBody, String encryptAlgorithm, String clientSecretKey) {
+	private String doOutboundPreEncrypt(Object eaiBody, String encryptAlgorithm, String clientSecretKey, String encryptAES256Iv, String encryptAES256Key, String certPath ) {
 		
 		String encryptedMessage = "";
 		String encryptedJsonKey = "";
@@ -1554,4 +1566,4 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		logger.debug("HttpClientAdapterServiceRest] after concatenate url=[" + targetUrl + "] ");
 		return targetUrl;
 	}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/common/logger/EAILogDAO.java b/src/main/java/com/eactive/eai/common/logger/EAILogDAO.java
index 40bd60f..3a48e5d 100644
--- a/src/main/java/com/eactive/eai/common/logger/EAILogDAO.java
+++ b/src/main/java/com/eactive/eai/common/logger/EAILogDAO.java
@@ -60,11 +60,11 @@ import com.ext.eai.common.stdmessage.STDMessageKeys;
 // safeDB
 import com.eactive.ext.kjb.safedb.KjbSafedbWrapper;
 import com.eactive.ext.kjb.safedb.Utils;
-// until here 
-// safeDB
-import com.eactive.ext.kjb.safedb.KjbSafedbWrapper;
-import com.eactive.ext.kjb.safedb.Utils;
+<<<<<<<<< Temporary merge branch 1
 // until here
+=========
+// until here 
+>>>>>>>>> Temporary merge branch 2
 
 
 @Service
diff --git a/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java b/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java
index 750310f..1a72200 100644
--- a/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java
+++ b/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java
@@ -121,7 +121,11 @@ public class RequestProcessor extends RequestProcessorSupport {
 		String bidInterface = adptGrpVO.getBidInterface();
 		String testMasterYn = adptGrpVO.getTestMasterYn();
 
-		// UUID 생성 : UUID = "-" 없는 32자리 UUID(광주은행 요청)
+		// UUID 생성 : UUID에서 - 없는 32자리
+		String uuid = "";
+		uuid = UUIDGenerator.getUUID().toString().replaceAll("-", "");
+		// UUID 생성 : UUID = server구분4자리 + UUID
+		/*
 		String uuid = "";
 		uuid = UUIDGenerator.getUUID().toString().replaceAll("-", "");
 
@@ -135,6 +139,7 @@ public class RequestProcessor extends RequestProcessorSupport {
 //			if (logger.isError()) logger.error(rspErrorMsg);
 //			throw new RequestProcessorException(rspErrorMsg);
 //		}
+		*/
 
 		ProcessVO vo = new ProcessVO();
 		vo.setAdapterGroupName(adapterGroupName);
@@ -339,6 +344,7 @@ public class RequestProcessor extends RequestProcessorSupport {
 		// 3. EAIMessage Object 생성
 		//String eaiSvcCd = mapper.getEaiSvcCode(standardMessage);   // commnet by jwhong
 		String eaiSvcCd = prop.getProperty("API_SERVICE_CODE");
+		System.out.println("***** eaiSvcCd is"+ eaiSvcCd);
 		String guid = mapper.getGuid(standardMessage);
 		String guidSeq = mapper.getGuidSeq(standardMessage);
 		String returnType = mapper.getSendRecvDivision(standardMessage); // S|R