From 6375f682b51c717fe720cc6644048081803bf284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=9D=B0?= Date: Tue, 25 Dec 2018 14:58:50 +0800 Subject: [PATCH] =?UTF-8?q?v1.1=20=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=8F=91=E8=A1=8C=E7=89=88=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/me/zhengjie/core/config/WebSecurityConfig.java | 2 +- .../me/zhengjie/core/security/JwtAuthorizationTokenFilter.java | 2 -- src/main/java/me/zhengjie/system/domain/vo/MenuVo.java | 2 ++ .../java/me/zhengjie/system/service/impl/MenuServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/zhengjie/core/config/WebSecurityConfig.java b/src/main/java/me/zhengjie/core/config/WebSecurityConfig.java index 436a7161..ef42476c 100644 --- a/src/main/java/me/zhengjie/core/config/WebSecurityConfig.java +++ b/src/main/java/me/zhengjie/core/config/WebSecurityConfig.java @@ -77,7 +77,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .authorizeRequests() .antMatchers("/auth/**").permitAll() - .antMatchers("/websocket/**").anonymous() + .antMatchers("/websocket/**").permitAll() .antMatchers("/druid/**").anonymous() // swagger start diff --git a/src/main/java/me/zhengjie/core/security/JwtAuthorizationTokenFilter.java b/src/main/java/me/zhengjie/core/security/JwtAuthorizationTokenFilter.java index d3df5639..d6c60d3b 100644 --- a/src/main/java/me/zhengjie/core/security/JwtAuthorizationTokenFilter.java +++ b/src/main/java/me/zhengjie/core/security/JwtAuthorizationTokenFilter.java @@ -49,8 +49,6 @@ public class JwtAuthorizationTokenFilter extends OncePerRequestFilter { } catch (ExpiredJwtException e) { logger.error(e.getMessage()); } - } else { - logger.warn("couldn't find bearer string, will ignore the header"); } logger.debug("checking authentication for user '{}'", username); diff --git a/src/main/java/me/zhengjie/system/domain/vo/MenuVo.java b/src/main/java/me/zhengjie/system/domain/vo/MenuVo.java index 0c32098c..0ec5b3cf 100644 --- a/src/main/java/me/zhengjie/system/domain/vo/MenuVo.java +++ b/src/main/java/me/zhengjie/system/domain/vo/MenuVo.java @@ -17,6 +17,8 @@ public class MenuVo { private String path; + private String redirect; + private String component; private Boolean alwaysShow; diff --git a/src/main/java/me/zhengjie/system/service/impl/MenuServiceImpl.java b/src/main/java/me/zhengjie/system/service/impl/MenuServiceImpl.java index 71e376be..dd54226a 100644 --- a/src/main/java/me/zhengjie/system/service/impl/MenuServiceImpl.java +++ b/src/main/java/me/zhengjie/system/service/impl/MenuServiceImpl.java @@ -141,7 +141,7 @@ public class MenuServiceImpl implements MenuService { if(menuDTO.getPid().equals(0L)){ //一级目录需要加斜杠，不然访问不了 menuVo.setPath("/" + menuDTO.getPath()); - menuVo.setName(null); + menuVo.setRedirect("noredirect"); } menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent())?"Layout":menuDTO.getComponent()); }