From 09d3c4a46e1b67415a716251acea7a1c592c8af7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 09:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260811' into dev_business
---
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
index 26b8624..ec93010 100644
--- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
+++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
@@ -29,16 +29,19 @@
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 java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+
/**
* 鑷畾涔夌殑 Spring Security 閰嶇疆閫傞厤鍣ㄥ疄鐜�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@AutoConfiguration
@AutoConfigureOrder(-1) // 鐩殑锛氬厛浜� Spring Security 鑷姩閰嶇疆锛岄伩鍏嶄竴閿敼鍖呭悗锛宱rg.* 鍩虹鍖呮棤娉曠敓鏁�
@@ -153,6 +156,7 @@
return webProperties.getAppApi().getPrefix() + url;
}
+ @SuppressWarnings("removal")
private Multimap<HttpMethod, String> getPermitAllUrlsFromAnnotations() {
Multimap<HttpMethod, String> result = HashMultimap.create();
// 鑾峰緱鎺ュ彛瀵瑰簲鐨� HandlerMethod 闆嗗悎
@@ -167,7 +171,12 @@
continue;
}
Set<String> urls = new HashSet<>();
- urls.addAll(entry.getKey().getPatternValues());
+ if (entry.getKey().getPatternsCondition() != null) {
+ urls.addAll(entry.getKey().getPatternsCondition().getPatterns());
+ }
+ if (entry.getKey().getPathPatternsCondition() != null) {
+ urls.addAll(convertList(entry.getKey().getPathPatternsCondition().getPatterns(), PathPattern::getPatternString));
+ }
if (urls.isEmpty()) {
continue;
}
--
Gitblit v1.9.3