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

Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/eactive/bundle/bundles/20260102/eapim-admin_incremental_2025-12-01.bundle into jenkins_with_weblogic

Browse Source
This commit is contained in:
daekuk
2026-01-02 14:43:53 +09:00
parent 9c865a4513 4a2d774b2a
commit 7cd956a770
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/emergency.jsp
+4 -3
View File
@@ -6,16 +6,17 @@
<head> <head>
<script language="javascript" src="<c:url value="/js/jquery-1.12.1.min.js"/>"></script> <script language="javascript" src="<c:url value="/js/jquery-1.12.1.min.js"/>"></script>
<script language="javascript"> <script language="javascript">
var contextPath = "<%=request.getContextPath()%>";
var serviceType = localStorage["serviceType"]; var serviceType = localStorage["serviceType"];
var mainUrl = "/monitoring/main.do"; var mainUrl = contextPath + "/main.do";
if (serviceType) { if (serviceType) {
mainUrl += "?serviceType=" + serviceType; mainUrl += "?serviceType=" + serviceType;
} }
<% if (StringUtils.isNotBlank(SessionManager.getUserId(request)) || StringUtils.isNotBlank(SessionManager.getRoleIdString(request))) { %> <% if (StringUtils.isNotBlank(SessionManager.getUserId(request)) || StringUtils.isNotBlank(SessionManager.getRoleIdString(request))) { %>
window.location.replace(mainUrl); window.location.replace(mainUrl);
<% } else { %> <% } else { %>
window.location.replace("/monitoring/loginForm.do"); window.location.replace(contextPath + "/loginForm.do");
<% } %> <% } %>
</script> </script>
</head> </head>
WebContent/jsp/onl/admin/authserver/clientManDetail.jsp
+9 -3
View File
@@ -133,14 +133,17 @@
var selectedApiGrid = $("#selectedApiGrid"); var selectedApiGrid = $("#selectedApiGrid");
selectedApiGrid.jqGrid({ selectedApiGrid.jqGrid({
datatype: "local", datatype: "local",
gridview: true, // 성능 향상
rownumbers: true, // 가상 인덱스
rownumWidth: 40,
colNames: ['API ID', 'API 이름'], colNames: ['API ID', 'API 이름'],
colModel: [ colModel: [
{name: 'apiId', index: 'apiId', width: 100, align: 'center'}, {name: 'apiId', index: 'apiId', width: 100, align: 'center'},
{name: 'apiDesc', index: 'apiDesc', width: 100, align: 'center'} {name: 'apiDesc', index: 'apiDesc', width: 100, align: 'center'}
], ],
rowNum: 10, rowNum: -1,
rowList: [10, 20, 30], // rowList: [10, 20, 30],
pager: '#selectedApiGridPager', // pager: '#selectedApiGridPager',
sortname: 'apiId', sortname: 'apiId',
viewrecords: true, viewrecords: true,
sortorder: "asc", sortorder: "asc",
@@ -152,6 +155,9 @@
// selectedApiGrid.jqGrid('delRowData', rowid); // selectedApiGrid.jqGrid('delRowData', rowid);
} }
}); });
selectedApiGrid.jqGrid('setLabel', 'rn', 'No'); // 가상 인덱스 ColNames
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: url, url: url,
src/main/java/com/eactive/eai/rms/common/interceptor/SessionCheckInterceptor.java
+2 -2
View File
@@ -67,9 +67,9 @@ public class SessionCheckInterceptor extends HandlerInterceptorAdapter {
} else { } else {
//request.getRequestDispatcher("/monitoring/loginForm.do").forward(request, response); //request.getRequestDispatcher("/monitoring/loginForm.do").forward(request, response);
//request.getSession().setAttribute("redirectInProgress", true); //request.getSession().setAttribute("redirectInProgress", true);
response.sendRedirect("/monitoring/rms/logout.do"); response.sendRedirect(request.getContextPath() + "/rms/logout.do");
//response.sendRedirect("/monitoring/loginForm.do"); //response.sendRedirect("/monitoring/loginForm.do");
} }
} }
src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java
+1 -1
View File
@@ -553,7 +553,7 @@ public class ApiInterfaceService extends OnlBaseService {
restOption.setMethod(outboundHttpMethod); restOption.setMethod(outboundHttpMethod);
restOption.setExtraPath(outboundRestPath); restOption.setExtraPath(outboundRestPath);
String pathType = outboundRestPath.matches(".*\\{[a-zA-Z]+\\}.*") ? "variableUrlRequest" : "simpleRequest"; String pathType = outboundRestPath.matches(".*\\{[_a-zA-Z]+\\}.*") ? "variableUrlRequest" : "simpleRequest";
restOption.setType(pathType); restOption.setType(pathType);
if (StringUtils.isNotBlank(contentType)) { if (StringUtils.isNotBlank(contentType)) {