diff --git a/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/test/TestController.java index 29fd21ba..5ad5cedb 100644 --- a/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/test/TestController.java +++ b/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/test/TestController.java @@ -21,7 +21,7 @@ public class TestController { + "
Sa-Token " + SaTokenConsts.VERSION_NO + "
"; - return str; + return str; } } diff --git a/sa-token-demo/sa-token-demo-quick-login/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-quick-login/src/main/resources/application.yml index da460501..8b111db3 100644 --- a/sa-token-demo/sa-token-demo-quick-login/src/main/resources/application.yml +++ b/sa-token-demo/sa-token-demo-quick-login/src/main/resources/application.yml @@ -19,7 +19,7 @@ sa: # 指定拦截路径 # include: /** # 指定排除路径 - # exclude: /sss,/fff + # exclude: /1.jpg # 将本地磁盘的某个路径作为静态资源开放 # dir: file:E:\static diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java index 337e3ab3..83f92840 100644 --- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java +++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java @@ -41,17 +41,22 @@ public class SaQuickRegister { @Order(SaTokenConsts.ASSEMBLY_ORDER - 1) public SaServletFilter getSaServletFilter() { return new SaServletFilter() - // 拦截路由 & 放行路由 - .addInclude(SaQuickManager.getConfig().getInclude().split(",")) - .addExclude(SaQuickManager.getConfig().getExclude().split(",")) + // 拦截路由 + .addInclude("/**") + // 排除掉登录相关接口,不需要鉴权的 .addExclude("/favicon.ico", "/saLogin", "/doLogin", "/sa-res/**"). // 认证函数: 每次请求执行 - setAuth(r -> { - // 未登录时直接转发到login.html页面 - if (SaQuickManager.getConfig().getAuth() && StpUtil.isLogin() == false) { - SaHolder.getRequest().forward("/saLogin"); - SaRouter.back(); - } + setAuth(obj -> { + SaRouter + .match(SaQuickManager.getConfig().getInclude().split(",")) + .notMatch(SaQuickManager.getConfig().getExclude().split(",")) + .check(r -> { + // 未登录时直接转发到login.html页面 + if (SaQuickManager.getConfig().getAuth() && StpUtil.isLogin() == false) { + SaHolder.getRequest().forward("/saLogin"); + SaRouter.back(); + } + }); }). // 异常处理函数:每次认证函数发生异常时执行此函数