서브모듈 인덱스 업데이트 (elink-online-common)

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

src/main/java/com/eactive/eai/adapter/controller/DJBApiAdapterController.java

@@ -51,6 +51,7 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
 	@Autowired
 	DJBApiAdapterService service;
 	
+	EAIServerManager eaiServerManager;
 	/**
 	 * DJErp OAuth 조기 적용을 위한 Controller
 	 * 
@@ -89,7 +90,13 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
 
 		ResponseEntity<String> responseEntity = null;
 		Properties transactionProp = new Properties();
-		String uuid = UUIDGenerator.getUUID().toString().replaceAll("-", "");
+		
+		if(eaiServerManager == null)
+			eaiServerManager = EAIServerManager.getInstance();
+		
+		String instid = eaiServerManager.getGroupInstId();
+		String uuid = instid+UUIDGenerator.getUUID().toString().replaceAll("-", "");
+		
 		transactionProp.setProperty(TransactionContextKeys.TRANSACTION_UUID, uuid);
 		transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr);
 
@@ -154,14 +161,14 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
 				responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(responseErrorMsg);
 			} else if (e instanceof JwtAuthException) {
 				responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName,
-						transactionProp, MessageUtil.ERROR_CODE_AP_ERROR, e, adptMsgType, encode, errorResponseFormat);
+						transactionProp, MessageUtil.ERROR_CODE_AUTH_FAIL, e, adptMsgType, encode, errorResponseFormat);
 				JwtAuthException e1 = (JwtAuthException) e;
 				this.logError(servletRequest, adapterGroupName, e1.getCode(), responseErrorMsg, transactionProp, e);
 				logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e);
 				responseEntity = ResponseEntity.status(HttpStatus.UNAUTHORIZED).contentType(mediaType).body(responseErrorMsg);
 			} else if (e instanceof HttpStatusException) {
 				responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName,
-						transactionProp, MessageUtil.ERROR_CODE_AUTH_FAIL, e, adptMsgType, encode, errorResponseFormat);
+						transactionProp, MessageUtil.ERROR_CODE_AP_ERROR, e, adptMsgType, encode, errorResponseFormat);
 				logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage());
 				HttpStatusException e1 = (HttpStatusException) e;
 				responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(responseErrorMsg);

src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DecrytTestFilter.java

@@ -6,7 +6,6 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.simple.JSONObject;
 import org.springframework.http.HttpStatus;
 
 import com.eactive.eai.adapter.http.dynamic.filter.FilterException;
@@ -16,6 +15,7 @@ import com.eactive.eai.common.security.ARIACryptoModuleExtension;
 import com.eactive.eai.common.security.CryptoModuleExtension;
 import com.eactive.eai.common.util.Logger;
 import com.eactive.eai.util.HexaConverter;
+import com.eactive.eai.util.JsonPathUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -30,16 +30,7 @@ public class DecrytTestFilter implements HttpAdapterFilter {
 	public Object doPreFilter(String adptGrpName, String adptName, Object message, Properties prop,
 			HttpServletRequest request, HttpServletResponse response) throws Exception {
 		try {
-			ObjectNode rootNode = null;
+			ObjectNode rootNode = (ObjectNode)JsonPathUtil.toTree(message);
-			String jsonStr = null;
-			if (message instanceof String) {
-				jsonStr = (String) message;
-			} else if (message instanceof JSONObject) {
-				jsonStr = ((JSONObject) message).toJSONString();
-			} else {
-				return message;
-			}
-			rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr);
 			
 			JsonNode alg = rootNode.get("alg");
 			JsonNode mode = rootNode.get("mode");

src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/EncrytTestFilter.java

@@ -8,7 +8,6 @@ import javax.crypto.SecretKey;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.simple.JSONObject;
 import org.springframework.http.HttpStatus;
 
 import com.eactive.eai.adapter.http.dynamic.filter.FilterException;
@@ -19,6 +18,7 @@ import com.eactive.eai.common.security.ARIACryptoModuleExtension;
 import com.eactive.eai.common.security.CryptoModuleExtension;
 import com.eactive.eai.common.util.Logger;
 import com.eactive.eai.util.HexaConverter;
+import com.eactive.eai.util.JsonPathUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -33,19 +33,7 @@ public class EncrytTestFilter implements HttpAdapterFilter {
 	public Object doPreFilter(String adptGrpName, String adptName, Object message, Properties prop,
 			HttpServletRequest request, HttpServletResponse response) throws Exception {
 		try {
-			ObjectNode rootNode = null;
+			ObjectNode rootNode = (ObjectNode)JsonPathUtil.toTree(message);
-			String jsonStr = null;
-			if (message instanceof String) {
-				jsonStr = (String) message;
-			} else if (message instanceof ObjectNode) {
-				rootNode = (ObjectNode) message;
-			}  else if (message instanceof JSONObject) {
-				jsonStr = ((JSONObject) message).toJSONString();
-			} else {
-				return message;
-			}
-			if(rootNode == null)
-				rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr);
 			
 			// 1. HSM에서 키 가져오기
 			byte[] hsmKeyBytes = null;

src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/GenKeyFilter.java

@@ -8,7 +8,6 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.simple.JSONObject;
 import org.springframework.http.HttpStatus;
 
 import com.eactive.eai.adapter.http.dynamic.filter.FilterException;
@@ -18,6 +17,7 @@ import com.eactive.eai.common.util.Logger;
 import com.eactive.eai.custom.common.security.keyderiv.HsmContextSha256KeyDerivationStrategy;
 import com.eactive.eai.custom.common.security.keyderiv.HsmKeyAndIvSliceDerivationStrategy;
 import com.eactive.eai.util.HexaConverter;
+import com.eactive.eai.util.JsonPathUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -32,16 +32,7 @@ public class GenKeyFilter implements HttpAdapterFilter {
 	public Object doPreFilter(String adptGrpName, String adptName, Object message, Properties prop,
 			HttpServletRequest request, HttpServletResponse response) throws Exception {
 		try {
-			ObjectNode rootNode = null;
+			ObjectNode rootNode = (ObjectNode)JsonPathUtil.toTree(message);
-			String jsonStr = null;
-			if (message instanceof String) {
-				jsonStr = (String) message;
-			} else if (message instanceof JSONObject) {
-				jsonStr = ((JSONObject) message).toJSONString();
-			} else {
-				return message;
-			}
-			rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr);
 			
 			JsonNode hsmKey = rootNode.get("hsmKey");
 			JsonNode hsmIv = rootNode.get("hsmIv");

src/main/java/com/eactive/eai/custom/message/GUIDGeneratorDJB.java

@@ -28,7 +28,7 @@ public final class GUIDGeneratorDJB {
 
     static {
         // 노드번호(2): 서버명 마지막 2자리, 없으면 "00"
-        String serverName = System.getProperty("server.key", "");
+        String serverName = System.getProperty(com.eactive.eai.common.server.Keys.SERVER_KEY, "");
         if (serverName.length() >= 2) {
             NODE_NO = serverName.substring(serverName.length() - 2);
         } else {