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
WebContent/js/common-en.js
+7 -9
View File
@@ -37,16 +37,14 @@ function isChromeBrowse() {
}
// find Context
function getContextName()
{
// get context
var loc = location.href;
var sPos = loc.indexOf("/", 7)
var ePos = loc.indexOf("/", sPos+1)
function getContextName() {
// get context path from pathname (works with both http and https)
var pathname = location.pathname;
var pos = pathname.indexOf("/", 1);
if (ePos == -1) return "/";
else return loc.substr(sPos, ePos-sPos + 1);
}
if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/";
else return pathname.substring(0, pos + 1);
}
// return today : 20081231
function getToday()
{
WebContent/js/common-ko.js
+5 -6
View File
@@ -37,13 +37,12 @@ function isChromeBrowse() {
// find Context
function getContextName() {
// get context
var loc = location.href;
var sPos = loc.indexOf("/", 7)
var ePos = loc.indexOf("/", sPos + 1)
// get context path from pathname (works with both http and https)
var pathname = location.pathname;
var pos = pathname.indexOf("/", 1);
if (ePos == -1) return "/";
else return loc.substr(sPos, ePos - sPos + 1);
if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/";
else return pathname.substring(0, pos + 1);
}
// return today : 20081231
WebContent/js/custom.js
+1 -1
View File
@@ -149,7 +149,7 @@ jQuery.showModalDialog = function(options) { $().showModalDialog(options); };
var originalError = options.error;
options.error = function(xhr, status, error) {
if(xhr.status === 401) {
var location = getContextName() + '/';
var location = getContextName();
comloadError(xhr, status, error, location);
return;
}
WebContent/jsp/js/common-en.js
+7 -9
View File
@@ -37,16 +37,14 @@ function isChromeBrowse() {
}
// find Context
function getContextName()
{
// get context
var loc = location.href;
var sPos = loc.indexOf("/", 7)
var ePos = loc.indexOf("/", sPos+1)
function getContextName() {
// get context path from pathname (works with both http and https)
var pathname = location.pathname;
var pos = pathname.indexOf("/", 1);
if (ePos == -1) return "/";
else return loc.substr(sPos, ePos-sPos + 1);
}
if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/";
else return pathname.substring(0, pos + 1);
}
// return today : 20081231
function getToday()
{
WebContent/jsp/js/common-ko.js
+6 -8
View File
@@ -37,15 +37,13 @@ function isChromeBrowse() {
}
// find Context
function getContextName()
{
// get context
var loc = location.href;
var sPos = loc.indexOf("/", 7)
var ePos = loc.indexOf("/", sPos+1)
function getContextName() {
// get context path from pathname (works with both http and https)
var pathname = location.pathname;
var pos = pathname.indexOf("/", 1);
if (ePos == -1) return "/";
else return loc.substr(sPos, ePos-sPos + 1);
if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/";
else return pathname.substring(0, pos + 1);
}
// return today : 20081231
function getToday()
WebContent/jsp/onl/admin/common/propertyManDetail.jsp
+4
View File
@@ -193,6 +193,10 @@ var url_view = '<c:url value="/onl/admin/common/propertyMan.view" />';
});
});
$("#btn_delete").click(function() {
if(!confirm("삭제하시겠습니까?")){
return;
}
var postData = $('#ajaxForm').serializeArray();
postData.push({
name : "cmd",
WebContent/jsp/onl/admin/rule/layoutMan.jsp
+4
View File
@@ -313,6 +313,10 @@
$('#btn_import').click(onclickExcelImport);
$("#btn_delete").click(function () {
if(!confirm("삭제하시겠습니까?")){
return;
}
var id = "grid";
var delArr = new Array();
var ids = $("#grid").jqGrid('getDataIDs');
WebContent/jsp/onl/admin/rule/transform2/transform2Man.jsp
+4
View File
@@ -238,6 +238,10 @@ $(document).ready(function() {
$('#btn_clone').click(onclickBtnClone);
$("#btn_delete").click(function(){
if(!confirm("삭제하시겠습니까?")){
return;
}
var id = "grid";
var cnvsnNameArr = new Array();
var eaiSvcNameArr = new Array();
WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp
+13 -1
View File
@@ -703,7 +703,15 @@
transformRows = json.transformRows;
//eaiSvcName combo
$("input[name=eaiSvcName]").val('${param.eaiSvcName }');
$("input[name=eaiSvcDesc]").val('${param.eaiSvcDesc }');
var rawDesc = '${param.eaiSvcDesc}';
if (rawDesc && rawDesc !== "") {
$("input[name=eaiSvcDesc]").val(decodeURIComponent(rawDesc));
} else {
$("input[name=eaiSvcDesc]").val("");
}
//$("input[name=cnvsnDesc]").val('${param.cnvsnDesc }');
new makeOptions("CODE","NAME").setObj($("#functionCombo")).setData(json.functionRows).setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("transformManDetail.none")%>").setFormat(codeName3OptionFormat).rendering();
@@ -1065,6 +1073,10 @@
});
$("#btn_delete").click(function(){
if(!confirm("삭제하시겠습니까?")){
return;
}
var postData = [];
const cnvsnName = $("select[name=transformForEaiSvcNameCombo]").val();
const cnvsnType = cnvsnName.slice(-3);
WebContent/jsp/onl/admin/service/jmsQueueManDetail.jsp
+4
View File
@@ -154,6 +154,10 @@ $(document).ready(function() {
});
});
$("#btn_delete").click(function(){
if(!confirm("삭제하시겠습니까?")){
return;
}
var disabled = $('#ajaxForm').find(':input:disabled').removeAttr('disabled');
var postData = $('#ajaxForm').serializeArray();
disabled.attr('disabled','disabled');
WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp
+36 -12
View File
@@ -62,12 +62,22 @@
position: relative;
}
/* 어댑터, 메서드 라이브 서치 사용시 width 깨짐 방지 */
/* 어댑터, 메서드 select2 사용시 width 깨짐 방지 */
.select2-container {
width: 100% !important;
box-sizing: border-box;
}
/* 버튼 내용이 길어질 경우 말줄임표(...) 처리 */
.btn-ellipsis {
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
vertical-align: middle;
}
</style>
<script language="javascript" >
var isDetail = false;
@@ -319,17 +329,27 @@
}
}
function setStandardMessageItemsLabel(items, buttonId) {
const label = items.map(function(item) {
return item.COLUMNNAME + '=' + item.COLUMNVALUE;
}).join(';');
function setStandardMessageItemsLabel(items, buttonId) {
const label = items.map(function(item) {
return item.COLUMNNAME + '=' + item.COLUMNVALUE;
}).join(';');
if(items.length > 0) {
$('#'+buttonId).text('수정 ['+label+']');
} else {
$('#'+buttonId).text('수정');
}
}
const $btn = $('#' + buttonId);
if (items.length > 0) {
$btn.text('수정 [' + label + ']');
$btn.attr('title', '수정 [' + label + ']');
$btn.addClass('btn-ellipsis');
} else {
$btn.text('수정');
$btn.removeAttr('title');
$btn.removeClass('btn-ellipsis');
}
}
function setupStdCommonValueModal(type) {
currentStandardMessageType = type;
@@ -984,6 +1004,10 @@
$("#btn_modify").click(modifyApi);
$("#btn_delete").click(function(){
if(!confirm("삭제하시겠습니까?")){
return;
}
var postData = $('#ajaxForm').serializeArray();
postData.push({ name: "cmd" , value:"DELETE"});
@@ -1303,7 +1327,7 @@
alert(e.responseText);
},
complete: function() {
$("[id^='btn_']").prop("disabled", false);
$("[id=doCloneInterfaceButton]").prop("disabled", false);
$("#doCloneInterfaceButton").text("복제");
}
});
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