From 0381df6b17793575801ad84523e898500d8835be Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 十一月 2022 20:14:48 +0800
Subject: [PATCH] remove 移除过期 Anonymous 注解与其实现代码
---
/dev/null | 69 ----------------------------------
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java | 6 ---
2 files changed, 0 insertions(+), 75 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java
deleted file mode 100644
index 51eaf08..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.common.annotation;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 鍖垮悕璁块棶涓嶉壌鏉冩敞瑙�
- *
- * @author ruoyi
- * @deprecated 灏嗗湪鍚庣画鐗堟湰浣跨敤Sa-Token娉ㄨВ {@link SaIgnore} 浠ｆ浛
- */
-@Deprecated
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Anonymous {
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
index a7c51fa..2912286 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
@@ -5,8 +5,6 @@
import cn.dev33.satoken.router.SaRouter;
import cn.dev33.satoken.stp.StpLogic;
import cn.dev33.satoken.stp.StpUtil;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.config.properties.ExcludeUrlProperties;
import com.ruoyi.framework.config.properties.SecurityProperties;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -34,14 +32,10 @@
public void addInterceptors(InterceptorRegistry registry) {
// 娉ㄥ唽璺敱鎷︽埅鍣紝鑷畾涔夐獙璇佽鍒�
registry.addInterceptor(new SaInterceptor(handler -> {
- // 鑷畾涔夋敞瑙� @Anonymous 鍖垮悕璁块棶閰嶇疆锛屽悗缁増鏈皢鍒犻櫎
- ExcludeUrlProperties excludeUrlProperties = SpringUtils.getBean(ExcludeUrlProperties.class);
// 鐧诲綍楠岃瘉 -- 鎺掗櫎澶氫釜璺緞
SaRouter
// 鑾峰彇鎵�鏈夌殑
.match("/**")
- // 鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑锛堟瘡娆″尮閰嶏級
- .notMatch(excludeUrlProperties.getExcludes())
// 瀵规湭鎺掗櫎鐨勮矾寰勮繘琛屾鏌�
.check(() -> {
// 妫�鏌ユ槸鍚︾櫥褰� 鏄惁鏈塼oken
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java
deleted file mode 100644
index 99d2eae..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.framework.config.properties;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import cn.dev33.satoken.interceptor.SaInterceptor;
-import cn.hutool.core.util.ReUtil;
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import lombok.Getter;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-import org.springframework.web.util.pattern.PathPattern;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.regex.Pattern;
-
-/**
- * 璁剧疆娉ㄨВ鍏佽鍖垮悕璁块棶鐨剈rl
- *
- * @author Lion Li
- * @deprecated 灏嗗湪鍚庣画鐗堟湰浣跨敤Sa-Token娉ㄨВ {@link SaIgnore} 浠ｆ浛锛�
- * 搴曞眰杩囨护鏂规硶璇﹁ {@link SaInterceptor#preHandle(HttpServletRequest, HttpServletResponse, Object)}
- */
-@Deprecated
-@Lazy
-@Component
-public class ExcludeUrlProperties implements InitializingBean {
-
- private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");
-
- @Getter
- private final List<String> excludes = new ArrayList<>();
-
- @Override
- public void afterPropertiesSet() {
- String asterisk = "*";
- RequestMappingHandlerMapping mapping = SpringUtils.getBean("requestMappingHandlerMapping", RequestMappingHandlerMapping.class);
- Map<RequestMappingInfo, HandlerMethod> map = mapping.getHandlerMethods();
-
- map.keySet().forEach(info -> {
- HandlerMethod handlerMethod = map.get(info);
-
- // 鑾峰彇鏂规硶涓婅竟鐨勬敞瑙� 鏇夸唬path variable 涓� *
- Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class);
- Optional.ofNullable(method).ifPresent(anonymous -> {
- Set<PathPattern> patterns = info.getPathPatternsCondition().getPatterns();
- patterns.forEach(url -> {
- excludes.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, asterisk));
- });
- });
-
- // 鑾峰彇绫讳笂杈圭殑娉ㄨВ, 鏇夸唬path variable 涓� *
- Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class);
- Optional.ofNullable(controller).ifPresent(anonymous -> {
- Set<PathPattern> patterns = info.getPathPatternsCondition().getPatterns();
- patterns.forEach(url -> {
- excludes.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, asterisk));
- });
- });
- });
- }
-
-}
--
Gitblit v1.9.3