Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/KJB_DEV/eapim-bundle/bundles/251208/eapim-online_incremental_2025-11-01.bundle into jenkins_with_weblogic

WebContent/WEB-INF/applicationContext-jpa.xml

@@ -63,7 +63,7 @@
         <prop key="hibernate.hbm2ddl.auto">validate</prop>
         <prop key="hibernate.format_sql">true</prop>
         <prop key="hibernate.show_sql">false</prop>
-        <prop key="hibernate.dialect">${hibernate.dialect:org.hibernate.dialect.PostgreSQL10Dialect}</prop>
+        <prop key="hibernate.dialect">${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect}</prop>
         <prop key="hibernate.jdbc.batch_size">100</prop>
         <prop key="hibernate.jdbc.fetch_size">100</prop>
         <prop key="hibernate.cache.use_second_level_cache">false</prop>

build.gradle

@@ -51,6 +51,7 @@ war {
 	
 	if (profile == "weblogic") {
 		webXml = file("WebContent/WEB-INF/weblogic-web.xml")
+		exclude 'WEB-INF/web.xml'
 	}
 	archiveFileName = "eapim-online.war"
 	duplicatesStrategy = DuplicatesStrategy.WARN

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

@@ -309,14 +309,34 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
         		result = mapper.writeValueAsString(rootNode);
         	}
         }
-                            
+                     
+        // KJBank는 요청에 대한 응답 (Sync응답, Aync 에 대한 Ack응답) 에 대하여 암호화 하지 않는다. 무조건 안한다. 따라서 아래부분은 구현은 했지만 사용하지 않는다.
+        //result = doPostEncryption(result, transactionProp);   // jwhong Encrypt
+        // ASYNC 인 경우 광주은행은 RETURN 해 주는 값들이 수정되어야 한다. JWHONG
+        /*
+        if ("ASYN".equals(syncAsyncType) && MessageType.JSON.equals(adptMsgType) && StringUtils.isNotBlank(headerGroupName)) {
+        	ObjectMapper mapper = new ObjectMapper();
+        	ObjectNode rootNode = (ObjectNode) mapper.readTree(result);
+        	JsonNode headerGroup = rootNode.get(headerGroupName);
+        	if(headerGroup != null) {
+        		for(Iterator<String> it = headerGroup.fieldNames(); it.hasNext();) {
+    				String name = it.next();
+    				String value = headerGroup.get(name).asText();
+    				response.addHeader(name, value);
+        		}
+        		rootNode.remove(headerGroupName);
+        		result = mapper.writeValueAsString(rootNode);
+        	}
+        }
+        */
+        
         // KJBank는 요청에 대한 응답 (Sync응답, Aync 에 대한 Ack응답) 에 대하여 암호화 하지 않는다. 무조건 안한다. 따라서 아래부분은 구현은 했지만 사용하지 않는다.
         //result = doPostEncryption(result, transactionProp);   // jwhong Encrypt
         return result;
     }
     
     
-    // jwhong decrypt 
+    // jwhong decrypt
 
     private String doPreDecryption(String eaiBody, Properties transactionProp, HttpServletRequest request) {
     	String decryptAlgorithm = transactionProp.getProperty(ENCRYPT_ALGORITHM, "");

src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2Controller.java

@@ -61,7 +61,7 @@ public class KjbMGOAuth2Controller {
 	@Autowired
 	private TokenIssuanceLogDAO tokenIssuanceLogDAO;
 
-	@RequestMapping(value = "/mapi/oauth2/token2", method = RequestMethod.POST, produces = "application/json; charset=\"UTF-8\"")
+	@RequestMapping(value = "/mapi/oauth2/token", method = RequestMethod.POST, produces = "application/json; charset=\"UTF-8\"")
 	@ResponseBody
 	public KjbMGOAuth2AccessTokenResponse token(@RequestBody KjbMGOAuth2AccessTokenRequest tokenRequest,
 			HttpServletRequest request, HttpServletResponse response) {