diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java index 0e813dc..3ff37da 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java @@ -41,7 +41,6 @@ public class TestController { @RequestMapping("/index") - @TokenIgnore public ApiResp index() { TokenBean tokenBean = new TokenBean("11", "", "fdfd"); @@ -67,7 +66,6 @@ public class TestController { @RequestMapping("/export") - @TokenIgnore public ApiResp export() { // List list = new ArrayList<>(); diff --git a/springboot-ademo/src/main/resources/application.yml b/springboot-ademo/src/main/resources/application.yml index 0c95fe3..6585c49 100644 --- a/springboot-ademo/src/main/resources/application.yml +++ b/springboot-ademo/src/main/resources/application.yml @@ -20,3 +20,7 @@ spring: logging: file: name: runtime/logs/tiesheng.log +tiesheng: + token: + ignore-paths: + - /test/index diff --git a/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenAspect.java b/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenAspect.java index 9ead849..e7e2cbe 100644 --- a/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenAspect.java +++ b/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenAspect.java @@ -1,6 +1,5 @@ package com.tiesheng.login.config.token; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.tiesheng.annotation.token.TokenIgnore; @@ -55,12 +54,12 @@ public class TsTokenAspect { String[] ignorePaths = tsTokenConfig.getIgnorePaths(); if (ObjUtil.isNotEmpty(ignorePaths)) { for (String path : ignorePaths) { - if (path.contains("/**")) { - path = path.replace("/**", ""); - if (StrUtil.startWith(requestURI, path)) { - return; - } + if (path.contains("/**") && + StrUtil.startWith(requestURI, path.replace("/**", ""))) { + // 通配路径 + return; } else if (requestURI.equals(path)) { + // 完整路径 return; } }