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()); }