djb-eapim/eapim-online
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jenkins_with_weblogic

Browse Source 
# Conflicts:
#	WebContent/WEB-INF/weblogic.xml
This commit is contained in:
Rinjae
2025-10-13 17:02:33 +09:00
parent 6d2faf3d16 4c4a22a2a5
commit f7736e39a9
8 changed files with 302 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/META-INF/context.xml
+29 -1
View File
@@ -25,10 +25,38 @@
<!-- url: The JDBC connection url for connecting to your MySQL database.
-->
<Resource name="NDAPIGW_APP_NXA" auth="Container" type="javax.sql.DataSource"
<!--
<Resource name="NDAPIGW_APP_NXA" auth="Container" type="javax.sql.DataSource"
maxTotal="10" initialSize="10" maxIdle="10" maxActive="10" maxWaitMillis="10000"
poolPreparedStatements="true" validationQuery="SELECT 1" validationInterval="600000"
username="apigw" password="apigw" driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://192.168.8.30:13306/apigw"/>
-->
<!-- APIGW myPC MySql 5.7 -->
<Resource name="jndi/dsAPIGW" auth="Container" type="javax.sql.DataSource"
maxTotal="10" initialSize="10" maxIdle="10" maxActive="10" maxWaitMillis="10000"
poolPreparedStatements="true" validationQuery="SELECT 1" validationInterval="600000"
username="apigw" password="apigw" driverClassName="com.mysql.cj.jdbc.Driver"
url="jdbc:mysql://localhost:3306/apigw"/>
<!-- APIGW -->
<!--
<Resource name="jndi/dsAPIGW" auth="Container" type="javax.sql.DataSource"
maxTotal="10" maxIdle="10" maxWaitMillis="10000"
username="apigw" password="apigw1234" driverClassName="oracle.jdbc.OracleDriver"
url="jdbc:oracle:thin:@//localhost:1521/XE"/>
-->
<!-- APIGW 유차장 ORACLE-->
<Resource name="jdbc/dsOBP_AGW" auth="Container" type="javax.sql.DataSource"
maxTotal="10" maxIdle="10" maxWaitMillis="10000"
username="AGWAPP" password="AGWAPP123!" driverClassName="oracle.jdbc.OracleDriver"
url="jdbc:oracle:thin:@//192.168.240.177:1599/DAPM"/>
</Context>
WebContent/WEB-INF/properties/env.D.properties
+8 -6
View File
@@ -2,20 +2,22 @@
# Examples
# - H2 : org.hibernate.dialect.H2Dialect
# - oracle10g : org.hibernate.dialect.Oracle10gDialect
# - oracle12c : org.hibernate.dialect.Oracle12cDialect
# - MySQL5 : org.hibernate.dialect.MySQL5Dialect
# - MySQL8 : org.hibernate.dialect.MySQL8Dialect
# - MariaDB 10.3 : org.hibernate.dialect.MariaDB103Dialect
hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
hibernate.dialect=org.hibernate.dialect.Oracle12cDialect
# eLink default functions
# set System property in real system
#inst.Name=${HOSTNAME}
inst.Name=elinkSvr11
eai.jdbc.Name=NDAPIGW_APP_NXA
eai.rmiport=10211
eai.rmiserviceport=10212
inst.Name=agwSvr11
eai.jdbc.Name=jdbc/dsOBP_AGW
eai.rmiport=30111
eai.rmiserviceport=30112
eai.systemmode=D
# EAI FEP MCI GW ...
eai.systemtype=API
eai.tableowner=ndapigw
eai.tableowner=AGWADM
eai.server.extractor=[0,2],[0,2],[-2]
WebContent/WEB-INF/properties/env.common.properties
+3 -1
View File
@@ -18,7 +18,9 @@ shutdown.wait.intervalms=1000
# message function
# use default options
# async queue
use.internal.queue=true
// below false to test Weblogic JMS, jwhong
#use.internal.queue=true
use.internal.queue=false
# sync-async mapping
use.internal.topic=true
# restore mapping
WebContent/WEB-INF/web.xml
+23 -12
View File
@@ -34,7 +34,18 @@
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext.xml</param-value>
</context-param>
<!-- Weblogic 14.1.2 서블릿 설정 -->
<!--
<servlet>
<servlet-name>default</servlet-name>
<servlet-class>weblogic.servlet.FileServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/static/*</url-pattern>
</servlet-mapping>
-->
<!-- oAuth 2.0 인증서버 설정 -->
<servlet>
<servlet-name>authserver</servlet-name>
@@ -60,17 +71,17 @@
</filter-mapping>
<!-- Dynamic REST API 어댑터 설정 -->
<!-- <servlet>-->
<!-- <description/>-->
<!-- <servlet-name>RestApiDynamicInAdapter</servlet-name>-->
<!-- <servlet-class>com.eactive.eai.adapter.http.dynamic.RestApiAdapterMain</servlet-class>-->
<!-- <load-on-startup>2</load-on-startup>-->
<!-- </servlet>-->
<!-- <servlet-mapping>-->
<!-- <servlet-name>RestApiDynamicInAdapter</servlet-name>-->
<!-- <url-pattern>/API/*</url-pattern>-->
<!-- <url-pattern>/api/*</url-pattern>-->
<!-- </servlet-mapping>-->
<servlet>
<description/>
<servlet-name>RestApiDynamicInAdapter</servlet-name>
<servlet-class>com.eactive.eai.adapter.http.dynamic.RestApiAdapterMain</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>RestApiDynamicInAdapter</servlet-name>
<url-pattern>/API/*</url-pattern>
<url-pattern>/api/*</url-pattern>
</servlet-mapping>
<!--
<listener>
WebContent/WEB-INF/weblogic.xml
+17 -19
View File
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.oracle.com/weblogic/weblogic-web-app">
<context-root>/</context-root>
<session-descriptor>
<timeout-secs>1800</timeout-secs>
<cookie-name>JSESSIONID_EMS</cookie-name>
<persistent-store-type>replicated_if_clustered</persistent-store-type>
</session-descriptor>
<container-descriptor>
<prefer-application-packages>
<package-name>org.slf4j.*</package-name>
<package-name>ch.qos.logback.*</package-name>
</prefer-application-packages>
<prefer-application-resources>
<resource-name>org/slf4j/impl/StaticLoggerBinder.class
</resource-name>
</prefer-application-resources>
</container-descriptor>
<weblogic-web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.bea.com/ns/weblogic/90" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-web-app.xsd">
<context-root>/</context-root>
<session-descriptor>
<timeout-secs>1800</timeout-secs>
<cookie-name>JSESSIONID_ONL</cookie-name>
<persistent-store-type>replicated_if_clustered</persistent-store-type>
</session-descriptor>
<container-descriptor>
<prefer-application-packages>
<packate-name>org.apach.ignite.*</packate-name>
<package-name>org.slf4j.*</package-name>
<package-name>ch.qos.logback.*</package-name>
</prefer-application-packages>
<prefer-application-resources>
<resource-name>org/slf4j/impl/StaticLoggerBinder.class</resource-name>
</prefer-application-resources>
</container-descriptor>
</weblogic-web-app>
WebContent/manage.jsp
+73
View File
@@ -0,0 +1,73 @@
<!--Generated by WebLogic Workshop-->
<%@ page language="java" contentType="text/html;charset=utf-8"%>
<html>
<head>
<title>Gateway 관리메뉴</title>
</head>
<body>
<%
String display = null;
try{
com.eactive.kakao.rolling.TableSuffixResolver service = com.eactive.eai.common.util.ApplicationContextProvider.getContext().getBean(com.eactive.kakao.rolling.TableSuffixResolver.class);
com.eactive.kakao.rolling.CurrentCommitIdService currentCommitIdService = com.eactive.eai.common.util.ApplicationContextProvider.getContext().getBean(com.eactive.kakao.rolling.CurrentCommitIdService.class);
String currentCommitId = currentCommitIdService.getSystemCommitId();
String currentSuffix = service.getCurrentSuffix();
if (currentCommitId != null && currentSuffix != null){
display = "rolling [ currentCommitId=" + currentCommitId + ", currentSuffix=" + currentSuffix +" ]" ;
}
}catch(Exception e){
}
%>
<p>POD[<%=System.getProperty("inst.Name")%>] IP[<%=request.getLocalAddr()%>] Hostname[<%=java.net.InetAddress.getLocalHost().getHostName()%>] <%=display != null ? display : "" %></p>
<p>
<a href="./mgr/errorcode.jsp" target="_blank">오류메시지 관리</a><br>
<a href="./mgr/adaptergrp.jsp" target="_blank">어댑터 관리</a><br>
<!-- <a href="./mgr/adapter.jsp" target="_blank">AdapterVO 관리</a><br> -->
<a href="./mgr/property.jsp" target="_blank">프라퍼티 관리</a><br>
<a href="./mgr/bizkey.jsp" target="_blank">로그조회키 관리</a><br>
<a href="./mgr/messagekey.jsp" target="_blank">메시지 키 관리</a><br>
<a href="./mgr/stdmessage.jsp" target="_blank">내부표준메시지 관리</a><br>
<a href="./mgr/eaimessage.jsp" target="_blank">EAI 서비스 코드 관리</a><br>
<!--
<table>
<tr><td colspan="2"><a href="./mgr/eaimessage.jsp" target="_blank">EAIMessage 관리</a> </td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;└──&gt;</td><td><a href="./mgr/svcmessages.jsp" target="_blank">ServiceMessage 관리</a></td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;└──&gt;</td><td><a href="./mgr/_condperrtginfo.jsp" target="_blank">조건부라우팅 관리</a></td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;└──&gt;</td><td><a href="./mgr/refmsgid.jsp" target="_blank">EAI 참고메시지 ID List</a></td></tr>
</table>
<br>
-->
<a href="./mgr/b2bextract.jsp" target="_blank">라우팅 필드추출 정보</a><br>
<a href="./mgr/b2bservice.jsp" target="_blank">라우팅 B2B기관 정보</a><br>
<a href="./mgr/b2badaptermap.jsp" target="_blank">라우팅 특정포트 매핑</a><br>
<a href="./mgr/eaiserver.jsp" target="_blank">EAI 서버 관리</a><br>
<a href="./mgr/routing.jsp" target="_blank">Routing 관리</a><br>
<a href="./mgr/testcall.jsp" target="_blank">TestCall 상태 관리</a><br>
<a href="./mgr/lifecycle.jsp" target="_blank">LifeCycle List</a><br>
<!--
<a href="./mgr/firstAccountInfo.jsp" target="_blank">집중계좌 조회</a><br>
-->
<br>
<table>
<tr><td colspan="2"><a href="./mgr/transRuleReload.jsp" target="_blank">Transform Rule Reload</a> </td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;└──&gt;</td><td><a href="./mgr/transformer/layoutType.jsp" target="_blank">메시지레이아웃 유형 관리</a></td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;└──&gt;</td><td><a href="./mgr/transformer/TransformFunc.jsp" target="_blank">변환함수 관리</a></td></tr>
<!-- <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;└──&gt;</td><td><a href="./mgr/transformer/layout.jsp" target="_blank">메시지레이아웃 관리</a></td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;└──&gt;</td><td><a href="./mgr/transformer/Transform.jsp" target="_blank">변환규칙 관리</a></td></tr> -->
</table>
<br>
<!--
<a href="./mgr/itsmmessage.jsp" target="_blank">ITSM 임계치 관리</a><br>
-->
<a href="./mgr/inflowAdapter.jsp" target="_blank">어댑터 유량제어 정보</a><br>
<a href="./mgr/inflowInterface.jsp" target="_blank">인터페이스 유량제어 정보</a><br>
</p>
</body>
</html>
build.gradle
+1 -3
View File
@@ -8,7 +8,7 @@ plugins {
}
group 'com.eactvie'
version '4.5.7'
//version '4.5.7'
def springVersion = "5.3.27"
//def springSecurityVersion = '4.2.13.RELEASE'
@@ -46,8 +46,6 @@ compileJava {
}
war {
archiveFileName = "eapim-online.war"
exclude '**/persistence.xml'
exclude '**/context.xml'
}
src/main/java/com/eactive/eai/adapter/service/ApiAdapterService.java
+148 -3
View File
@@ -36,6 +36,18 @@ import javax.servlet.http.HttpServletResponse;
import java.net.URLDecoder;
import java.util.*;
//for encrypt/decrypt jwhong
import com.eactive.eai.authserver.service.OAuth2Manager;
import com.kjbank.encrypt.exchange.crypto.AES256Cipher;
import com.kjbank.encrypt.exchange.crypto.AESCipher;
import java.nio.charset.StandardCharsets;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import org.springframework.security.oauth2.provider.ClientDetails;
@Service
public class ApiAdapterService extends HttpAdapterServiceSupport {
static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
@@ -49,7 +61,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
private static final String JSON_FIELD_NAME = "json-body";
private static final String FILE_GROUP_NAME = "image-file";
private static final String UPLOAD_ROOT_PATH = "UPLOAD_ROOT_PATH";
public String callApi(HttpServletRequest request, HttpServletResponse response, Properties httpProp, AdapterGroupVO adapterGroupVO, AdapterVO adapterVO, Properties transactionProp) throws Exception {
int traceLevel = 0;
@@ -70,7 +82,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
String paramValue = null;
String adptMsgType = null;
transactionProp.put(INBOUND_METHOD, request.getMethod());
transactionProp.put(INBOUND_URI, request.getRequestURI());
transactionProp.put(INBOUND_HEADER, getHeaders(request));
@@ -80,7 +92,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
String extUrl = StringUtils.removeStart(request.getRequestURI(), request.getContextPath());
transactionProp.put(INBOUND_EXTURI, extUrl);
} else {
transactionProp.put(INBOUND_EXTURI, getExtUri(request));
transactionProp.put(INBOUND_EXTURI, getExtUri(request));
}
transactionProp.put(INBOUND_CLIENT_IP, getClientIp(request)); // Client IP 추가
transactionProp.put(Processor.REQUEST_ACTION, adapterVO.getAdapterGroupVO().getRefClass());
@@ -92,6 +104,13 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
transactionProp.put(ENC_PATHS, httpProp.getProperty(ENC_PATHS, ""));
transactionProp.put(ENCRYPT_ALGORITHM, httpProp.getProperty(ENCRYPT_ALGORITHM, "")); //jwhong
transactionProp.put(HEADER_NAME_CLIENT_ID, getHeaders(request).get(HEADER_NAME_CLIENT_ID)); // jwhong
transactionProp.put(ENCRYPT_BASE_TYPE, httpProp.getProperty(ENCRYPT_BASE_TYPE, "")); //jwhong
//transactionProp.put(INBOUND_TOKEN, getHeaders(request).get(INBOUND_TOKEN)); // jwhong
transactionProp.put(INBOUND_TOKEN, getHeaders(request).get(INBOUND_TOKEN) != null ? getHeaders(request).get(INBOUND_TOKEN) : ""); //jwhong , null 이면 default로 "" put
try {
traceLevel = Integer.parseInt(traceLevelTemp);
} catch (Exception e) {
@@ -197,6 +216,9 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
if (paramValue == null) { // parameter가 없는 경우때문에 처리
paramValue = "";
}
else { // jwhong decrypt
paramValue = doPreDecryption(paramValue, transactionProp);
}
if ("Y".equals(urlDecodeYn) && isParameterType) {
@@ -279,6 +301,129 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
return result;
}
// jwhong encrypt
private String doPreDecryption(String eaiBody, Properties transactionProp) {
String decryptAlgorithm = transactionProp.getProperty(ENCRYPT_ALGORITHM, "");
String xElinkClientId = transactionProp.getProperty(HEADER_NAME_CLIENT_ID, ""); // 이 값이 OAuth의 client id 값이다 . http header 에 포함되어 온다. jwhong
String encryptBaseKeyType = transactionProp.getProperty(ENCRYPT_BASE_TYPE);
String inboundToken = transactionProp.getProperty(INBOUND_TOKEN, "");
if ( decryptAlgorithm == "" ) { // 복호화 대상이 아님
return eaiBody;
}
// 암호화 key를 token 내용으로 할지 client secret 내용으로 할지 결정함. adapter property에 정의함
// ENCRYPT_ALGORITHM 을 설정했는데 ENCRYPT_BASE_TYPE을 설정안하면 Decrypt 수행시 Exception 발생함
String clientSecret = "";
if ("TOKEN".equalsIgnoreCase(encryptBaseKeyType)) {
clientSecret = inboundToken;
} else if ( "SECRETKEY".equalsIgnoreCase(encryptBaseKeyType)) {
OAuth2Manager manager = OAuth2Manager.getInstance();
ClientDetails clientDetail = manager.getClientDeatilsStore().get(xElinkClientId);
if ( clientDetail != null ) {
clientSecret = clientDetail.getClientSecret();
}
}
byte[] decryptedMessage = null;
decryptedMessage = doInboundPreDecrypt(eaiBody, decryptAlgorithm,clientSecret);
String resultMessage = new String(decryptedMessage, StandardCharsets.UTF_8 );
return resultMessage;
//return new String(decryptedMessage, StandardCharsets.UTF_8 );
}
private byte[] convertObjectToBytes(Object obj) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(obj);
oos.flush();
return bos.toByteArray();
}
private byte[] convertObjectToBase64Bytes(Object obj) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(obj);
oos.flush();
oos.close();
// 직렬화된 byte[] → Base64 문자열 → 다시 byte[]로 변환
String base64String = Base64.getEncoder().encodeToString(bos.toByteArray());
return base64String.getBytes(StandardCharsets.UTF_8);
}
public static Object convertBytesToObject(byte[] bytes) throws IOException, ClassNotFoundException {
try (ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
ObjectInputStream ois = new ObjectInputStream(bis)) {
return ois.readObject();
}
}
private byte[] doInboundPreDecrypt(String eaiStringBody, String decryptAlgorithm, String clientSecretKey) {
byte[] decryptedMessage = null;
//String eaiStringBody = new String(eaiBody, StandardCharsets.UTF_8);
//test source
//System.out.println("eaiBody 바이트 배열 길이: " + eaiBody.length);
System.out.println("Base64 문자열: " + eaiStringBody);
System.out.println("Base64 문자열 길이: " + eaiStringBody.length());
System.out.println("Base64 문자열 끝: " + eaiStringBody.substring(eaiStringBody.length() - 10));
// Base64 디코딩 테스트
try {
byte[] decoded = Base64.getDecoder().decode(eaiStringBody);
System.out.println("디코딩 성공, 길이: " + decoded.length);
} catch (IllegalArgumentException e) {
System.out.println("Base64 디코딩 실패: " + e.getMessage());
}
// end test source
switch (decryptAlgorithm) {
case "AES128":
String key128 = clientSecretKey.substring(22,38); //togetherEncoder 경우는 substring(44,60) 이네??
try {
//String decryptedStrMessage = AESCipher.decrypt(eaiStringBody, key128);
String decryptedStrMessage = AESCipher.decryptExistException(eaiStringBody, key128);
decryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
logger.error("HttpClientAdapterServiceRest] AES128 Decryption error=" + e.getMessage());
}
break;
case "AES256":
String key = clientSecretKey.substring(10,42);
try {
String decryptedStrMessage = AES256Cipher.decrypt(eaiStringBody, key);
decryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
logger.error("HttpClientAdapterServiceRest] AES256 Decryption error=" + e.getMessage());
}
break;
default:
try {
//decryptedMessage = Arrays.copyOf(eaiBody, eaiBody.length);
decryptedMessage = eaiStringBody.getBytes();
} catch (Exception e) {
e.printStackTrace();
logger.error("HttpClientAdapterServiceRest] doOutboundPostFilter Array copy error=" + e.getMessage());
}
break;
}
return decryptedMessage;
}
// jwhong until here
private Map<String, String[]> assignParameterMap(HttpServletRequest request, String adptGrpName, String adptName,