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

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

Browse Source
This commit is contained in:
daekuk
2026-01-06 10:33:07 +09:00
parent 4397e7fe0f b86bde6c16
commit 385747c110
13 changed files with 139 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java
+44 -7
View File
@@ -1180,17 +1180,54 @@ public class ApiInterfaceService extends OnlBaseService {
apiInterfaceUI.setInboundRestPath(newInboundRestPath);
if ("Y".equals(apiInterfaceUI.getTransformYn())) {
apiInterfaceUI.setInboundRequestLayout(changeToTargetLayoutUI(layoutManService.getLayoutUiToExport(apiInterfaceUI.getInboundRequestLayout()), newBizCd, newApiInterfaceId));
apiInterfaceUI.setOutboundRequestLayout(changeToTargetLayoutUI(layoutManService.getLayoutUiToExport(apiInterfaceUI.getOutboundRequestLayout()), newBizCd, newApiInterfaceId));
apiInterfaceUI.setOutboundResponseLayout(changeToTargetLayoutUI(layoutManService.getLayoutUiToExport(apiInterfaceUI.getOutboundResponseLayout()), newBizCd, newApiInterfaceId));
apiInterfaceUI.setInboundResponseLayout(changeToTargetLayoutUI(layoutManService.getLayoutUiToExport(apiInterfaceUI.getInboundResponseLayout()), newBizCd, newApiInterfaceId));
apiInterfaceUI.setRequestTransform(changeToTargetTransformUI(transform2Service.getTransformUiToExport(apiInterfaceUI.getRequestTransform()), newBizCd, newApiInterfaceId, apiInterfaceUI.getInboundRequestLayout(), apiInterfaceUI.getOutboundRequestLayout()));
apiInterfaceUI.setResponseTransform(changeToTargetTransformUI(transform2Service.getTransformUiToExport(apiInterfaceUI.getResponseTransform()), newBizCd, newApiInterfaceId, apiInterfaceUI.getOutboundResponseLayout(), apiInterfaceUI.getInboundResponseLayout()));
String newInReq = processLayoutIfExist(apiInterfaceUI.getInboundRequestLayout(), newBizCd, newApiInterfaceId);
String newOutReq = processLayoutIfExist(apiInterfaceUI.getOutboundRequestLayout(), newBizCd, newApiInterfaceId);
String newOutRes = processLayoutIfExist(apiInterfaceUI.getOutboundResponseLayout(), newBizCd, newApiInterfaceId);
String newInRes = processLayoutIfExist(apiInterfaceUI.getInboundResponseLayout(), newBizCd, newApiInterfaceId);
apiInterfaceUI.setInboundRequestLayout(newInReq);
apiInterfaceUI.setOutboundRequestLayout(newOutReq);
apiInterfaceUI.setOutboundResponseLayout(newOutRes);
apiInterfaceUI.setInboundResponseLayout(newInRes);
if (newInReq != null && newOutReq != null) {
apiInterfaceUI.setRequestTransform(
changeToTargetTransformUI(
transform2Service.getTransformUiToExport(apiInterfaceUI.getRequestTransform()),
newBizCd, newApiInterfaceId, newInReq, newOutReq
)
);
}
if (newOutRes != null && newInRes != null) {
apiInterfaceUI.setResponseTransform(
changeToTargetTransformUI(
transform2Service.getTransformUiToExport(apiInterfaceUI.getResponseTransform()),
newBizCd, newApiInterfaceId, newOutRes, newInRes
)
);
}
}
importApiInterfaceUi(apiInterfaceUI, importDupliCheck);
return apiInterfaceUI;
}
/*
* 복제시 레이아웃 정보가 있는 경우에만 변환 로직을 수행
*/
private String processLayoutIfExist(String layoutId, String newBizCd, String newApiInterfaceId) {
if (layoutId == null || layoutId.isEmpty()) {
return null;
}
LayoutUI layoutEntity = layoutManService.getLayoutUiToExport(layoutId);
return changeToTargetLayoutUI(layoutEntity, newBizCd, newApiInterfaceId);
}
}
src/main/resources/com/eactive/eai/apim/portalstatistics/EAILog-oracle.xml
+4 -4
View File
@@ -32,7 +32,7 @@
FROM (
SELECT
CLIENTID AS CLIENT_ID,
RAND() AS REQUEST_URI,
DBMS_RANDOM.VALUE AS REQUEST_URI,
'$startTime$' AS STATISTICS_TIME,
EAISVCNAME AS API_ID,
NULL AS API_NAME,
@@ -49,7 +49,7 @@
UNION ALL
SELECT
CLIENTID AS CLIENT_ID,
RAND() AS REQUEST_URI,
DBMS_RANDOM.VALUE AS REQUEST_URI,
'$startTime$' AS STATISTICS_TIME,
EAISVCNAME AS API_ID,
NULL AS API_NAME,
@@ -59,8 +59,8 @@
ORGID AS ORG_ID,
ORGNAME AS ORG_NAME,
CASE
WHEN SUBSTRING(RSPNSERRCDNAME, 1, 2) = 'RE' THEN 0
WHEN SUBSTRING(RSPNSERRCDNAME, 1, 2) = 'FE' THEN 0
WHEN SUBSTR(RSPNSERRCDNAME, 1, 2) = 'RE' THEN 0
WHEN SUBSTR(RSPNSERRCDNAME, 1, 2) = 'FE' THEN 0
ELSE 1
END AS END_COUNT,
0 AS START_COUNT