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

Merge branch 'jenkins_with_weblogic' of ssh://git@192.168.240.178:18081/eapim/eapim-online.git into jenkins_with_weblogic

Browse Source
This commit is contained in:
parkl
2025-12-04 13:45:57 +09:00
parent 3dd7c141f7 3b1adbd7b2
commit 08b6990ccc
3 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/WEB-INF/weblogic-web.xml
+23 -13
View File
@@ -34,7 +34,17 @@
<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 +70,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>
@@ -155,4 +165,4 @@
<location>/error.jsp</location>
</error-page>
</web-app>
</web-app>
src/main/java/com/eactive/eai/adapter/controller/ApiAdapterController.java
+42 -24
View File
@@ -35,15 +35,11 @@ import com.eactive.eai.common.util.Logger;
import com.eactive.eai.common.util.MessageUtil;
import com.eactive.eai.common.util.UUIDGenerator;
import com.eactive.eai.inbound.error.InboundErrorInfoVO;
import com.kjbank.encrypt.exchange.crypto.AES256Cipher;
import com.kjbank.encrypt.exchange.crypto.AES256GCMCipher;
import com.kjbank.encrypt.exchange.crypto.AESCipher;
// jwhong
import org.json.simple.JSONObject;
import java.util.HashMap;
import java.util.Map;
import java.sql.Timestamp;
import com.eactive.eai.data.entity.onl.stdmessage.StandardMessageInfo;
@RestController
@@ -64,14 +60,27 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
String apiUri = servletRequest.getRequestURI();
// /api/v1/public/getUserInfo.svc
apiUri = StringUtils.removeStart(apiUri, servletRequest.getContextPath());
apiUri = StringUtils.removeEnd(apiUri, "/");
HttpDynamicInAdapterUri adptUri = findAdptUri(apiUri, HttpDynamicInAdapterManager.getInstance());
//Received time , jwhong
long receivedTimeMillis = System.currentTimeMillis();
String receivedTimeStr = String.valueOf(receivedTimeMillis);
apiUri = StringUtils.removeEnd(apiUri, "/");
//** jwhong TSEAIHS04의 api full path와 비교하여 adapter를 가져온다
String methodAndUri = servletRequest.getMethod() + "|" + apiUri;
HttpDynamicInAdapterUri adptUri = null;
String adapterGrpName ="";
String apiSvcCode = "";
try {
STDMessageDAO dao = ApplicationContextProvider.getContext().getBean(STDMessageDAO.class);
StandardMessageInfo stdInfo = dao.getSTDMsgByPath(methodAndUri);
String serviceKey = stdInfo.getBzwksvckeyname();
int idx = serviceKey.indexOf(":");
adapterGrpName = (idx != -1) ? serviceKey.substring(0, idx) : serviceKey; // ':' 이전 문자열 추출
apiSvcCode = stdInfo.getEaisvcname();
//아래 원래 Logic
adptUri = findAdptUri(apiUri, HttpDynamicInAdapterManager.getInstance(), adapterGrpName);
} catch (Exception e) {
adptUri = null;
}
//***
if (logger.isDebug()) {
logger.debug("ApiAdapterController] service request uri : " + servletRequest.getRequestURI());
}
@@ -80,8 +89,11 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
logError(servletRequest);
// throw new Exception("can not find Adapter Uri");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("can not find Adapter Uri");
}
}
//Received time , jwhong
long receivedTimeMillis = System.currentTimeMillis(); // 밀리세컨 단위로 보내야함
String receivedTimeStr = String.valueOf(receivedTimeMillis);
String adapterGroupName = adptUri.getAdptGrpName();
String adapterName = adptUri.getAdptName();
@@ -102,8 +114,9 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
String responseType = httpProp.getProperty(RESPONSE_TYPE, "SYNC");
ResponseEntity responseEntity = null;
Properties transactionProp = new Properties();
//transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeMillis); // jwhong, put api received time
// jwhong, put api received time, eaiSvcCode
transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr);
transactionProp.put(API_SERVICE_CODE, apiSvcCode);
try {
String responseData = service.callApi(servletRequest, servletResponse, httpProp, adapterGroupVO, adapterVO, transactionProp);
@@ -170,18 +183,23 @@ public class ApiAdapterController implements HttpAdapterServiceKey {
* @param apiUri
* @return
*/
private HttpDynamicInAdapterUri findAdptUri(String apiUri, HttpDynamicInAdapterManager manager) throws Exception {
private HttpDynamicInAdapterUri findAdptUri(String apiUri, HttpDynamicInAdapterManager manager, String adapterGrpName) throws Exception {
if (StringUtils.isBlank(apiUri)) {
return null;
}
}
//** jwhong TSEAIHS04의 api full path와 비교하여 adapter를 가져온다
STDMessageDAO dao = ApplicationContextProvider.getContext().getBean(STDMessageDAO.class);
StandardMessageInfo stdInfo = dao.getSTDMsgByPath(apiUri);
String serviceKey = stdInfo.getBzwksvckeyname();
int idx = serviceKey.indexOf(":");
String adapterGrpName = (idx != -1) ? serviceKey.substring(0, idx) : serviceKey; // ':' 이전 문자열 추출
//***
//* manager 출력
logger.warn("===== adptUriMap 상세 내용 =====");
for (Map.Entry<String, HttpDynamicInAdapterUri> entry : manager.adptUriMap.entrySet()) {
HttpDynamicInAdapterUri uriObj = entry.getValue();
logger.warn("GroupName=" + uriObj.getAdptGrpName()
+ ", AdapterName=" + uriObj.getAdptName()
+ ", URI=" + uriObj.getUri());
}
logger.warn("================================");
//
for (int i = 0; i < 10; i++) {
HttpDynamicInAdapterUri adptUri = manager.getAdptUri(apiUri);
src/main/java/com/eactive/eai/adapter/service/ApiAdapterService.java
+3
View File
@@ -448,6 +448,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
// end test source
switch (decryptAlgorithm) {
case "AES128":
case "AES128-TOSS":
try {
String key128 = clientSecretKey.substring(22,38); //togetherEncoder 경우는 substring(44,60) 이네??
@@ -532,6 +533,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
String decryptedBodyMessage = "";
switch (decryptAlgorithm) {
case "AES128":
case "AES128-TOSS":
decryptedJsonKey = "preScreeningRequest";
break;
@@ -587,6 +589,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
// end test source
switch (encryptAlgorithm) {
case "AES128":
case "AES128-TOSS":
try {
String key128 = clientSecretKey.substring(22,38); //togetherEncoder 경우는 substring(44,60) 이네??