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

2026-01-02 14:43:53 +09:00
parent 9c865a4513 4a2d774b2a
commit 7cd956a770
4 changed files with 16 additions and 9 deletions
@@ -6,16 +6,17 @@
  <head>
 	<script language="javascript" src="<c:url value="/js/jquery-1.12.1.min.js"/>"></script>
   	<script language="javascript">
+   	  var contextPath = "<%=request.getContextPath()%>";
   	  var serviceType = localStorage["serviceType"];
-   	  var mainUrl = "/monitoring/main.do";
+   	  var mainUrl = contextPath + "/main.do";
   	  if (serviceType) {
   		mainUrl += "?serviceType=" + serviceType;
   	  }
-   	  
+
   	  <% if (StringUtils.isNotBlank(SessionManager.getUserId(request)) || StringUtils.isNotBlank(SessionManager.getRoleIdString(request))) { %>
   	    window.location.replace(mainUrl);
   	  <% } else { %>
-   	    window.location.replace("/monitoring/loginForm.do");
+   	    window.location.replace(contextPath + "/loginForm.do");
   	  <% } %>
   	</script>
  </head>
@@ -133,14 +133,17 @@
            var selectedApiGrid = $("#selectedApiGrid");
            selectedApiGrid.jqGrid({
                datatype: "local",
+				gridview: true, // 성능 향상
+				rownumbers: true, // 가상 인덱스
+                rownumWidth: 40,
                colNames: ['API ID', 'API 이름'],
                colModel: [
                    {name: 'apiId', index: 'apiId', width: 100, align: 'center'},
                    {name: 'apiDesc', index: 'apiDesc', width: 100, align: 'center'}
                ],
-                rowNum: 10,
-                rowList: [10, 20, 30],
-                pager: '#selectedApiGridPager',
+                rowNum: -1,
+//                 rowList: [10, 20, 30],
+//                 pager: '#selectedApiGridPager',
                sortname: 'apiId',
                viewrecords: true,
                sortorder: "asc",
@@ -152,6 +155,9 @@
                    // selectedApiGrid.jqGrid('delRowData', rowid);
                }
            });
+
+            selectedApiGrid.jqGrid('setLabel', 'rn', 'No'); // 가상 인덱스 ColNames 
+            
            $.ajax({
                type: "POST",
                url: url,
@@ -67,9 +67,9 @@ public class SessionCheckInterceptor extends HandlerInterceptorAdapter {
 			} else {
 				//request.getRequestDispatcher("/monitoring/loginForm.do").forward(request, response);
 				//request.getSession().setAttribute("redirectInProgress", true);
-				response.sendRedirect("/monitoring/rms/logout.do");
+				response.sendRedirect(request.getContextPath() + "/rms/logout.do");
 				//response.sendRedirect("/monitoring/loginForm.do");
-			
+
 			}
 		}

@@ -553,7 +553,7 @@ public class ApiInterfaceService extends OnlBaseService {
            restOption.setMethod(outboundHttpMethod);
            restOption.setExtraPath(outboundRestPath);

-            String pathType = outboundRestPath.matches(".*\\{[a-zA-Z]+\\}.*") ? "variableUrlRequest" : "simpleRequest";
+            String pathType = outboundRestPath.matches(".*\\{[_a-zA-Z]+\\}.*") ? "variableUrlRequest" : "simpleRequest";
            restOption.setType(pathType);

            if (StringUtils.isNotBlank(contentType)) {