diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java index 08928a3..d7de67c 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -154,7 +154,12 @@ public class LoginController { public String getSessionRemainingTime(HttpServletRequest request)throws Exception{ long lastAccessTime = 0L; String sessionId = request.getSession().getId(); - lastAccessTime = (long)request.getSession().getAttribute(sessionId); - return JSON.toJSONString(TOKEN_EXPIRE_TIME-(System.currentTimeMillis()-lastAccessTime)); + Object attribute = request.getSession().getAttribute(sessionId); + if(null != attribute){ + lastAccessTime = (long)attribute; + return JSON.toJSONString(TOKEN_EXPIRE_TIME-(System.currentTimeMillis()-lastAccessTime)); + }else{ + return null; + } } } diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp index 00850ec..ed0c18c 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp @@ -13,143 +13,47 @@ var path = "${path}"; -<%--hhhhhhhhhhhhhhhh--%> @@ -157,17 +61,11 @@
- -