From 91f7cb34e4145774f382c33062bfa4758ba1c014 Mon Sep 17 00:00:00 2001 From: wgcloud Date: Fri, 1 Apr 2022 11:19:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=8Cissues=20#41?= =?UTF-8?q?=EF=BC=8C=E6=84=9F=E8=B0=A2=20=20@JamieSlome=20=20=20@hi-unc1e?= =?UTF-8?q?=20=20@huntr-helper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wgcloud/filter/AuthRestFilter.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wgcloud-server/src/main/java/com/wgcloud/filter/AuthRestFilter.java b/wgcloud-server/src/main/java/com/wgcloud/filter/AuthRestFilter.java index a2b6c42c..44369c22 100644 --- a/wgcloud-server/src/main/java/com/wgcloud/filter/AuthRestFilter.java +++ b/wgcloud-server/src/main/java/com/wgcloud/filter/AuthRestFilter.java @@ -31,8 +31,7 @@ public class AuthRestFilter implements Filter { @Autowired CommonConfig commonConfig; - String[] static_resource = {"/agent/minTask", "/agentGo/minTask", "login/toLogin", "login/login", "appInfo/agentList", - "/code/get", ".css", ".js", ".jpg", ".png", ".ico", ".gif", "font", ".eot", ".woff", ".svg", ".ttf", ".woff2"}; + String[] static_resource = {"/agent/minTask", "/agentGo/minTask", "/login/toLogin", "/login/login", "/appInfo/agentList", "/static/"}; String[] dash_views = {"/dash/main", "/dash/systemInfoList", "/dash/detail", "/dash/chart"}; @@ -42,18 +41,20 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo final HttpServletRequest request = (HttpServletRequest) servletRequest; final HttpSession session = request.getSession(); AccountInfo accountInfo = (AccountInfo) session.getAttribute(StaticKeys.LOGIN_KEY); - String uri = request.getRequestURL().toString(); -// log.info("uri----" + request.getRequestURL()); + String uri = request.getRequestURI(); + log.debug("uri----" + uri); + String servletPath = request.getServletPath(); + log.debug("servletPath----" + servletPath); menuActive(session, uri); for (String ss : static_resource) { - if (uri.indexOf(ss) != -1) { + if (servletPath.startsWith(ss)) { filterChain.doFilter(servletRequest, servletResponse); return; } } if (accountInfo == null) { for (String ss : dash_views) { - if (uri.indexOf(ss) != -1 && "true".equals(commonConfig.getDashView()) && request.getParameter(StaticKeys.DASH_VIEW_ACCOUNT) != null) { + if (servletPath.startsWith(ss) && "true".equals(commonConfig.getDashView()) && request.getParameter(StaticKeys.DASH_VIEW_ACCOUNT) != null) { filterChain.doFilter(servletRequest, servletResponse); return; }