ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
D 2024-03-28 19:47:15 +08:00
parent 485f50e7aa
commit 39a0c7d19f
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -18,6 +18,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version> <java.version>17</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<spring-boot.version>3.2.4</spring-boot.version>
<druid.version>1.2.21</druid.version> <druid.version>1.2.21</druid.version>
<bitwalker.version>1.21</bitwalker.version> <bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version> <swagger.version>3.0.0</swagger.version>
@ -44,7 +45,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>3.2.1</version> <version>${spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

14
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java
View File

@ -62,15 +62,13 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont
return Arrays.stream(new Pair[] { new Pair(info, method), new Pair(info, controller) }); return Arrays.stream(new Pair[] { new Pair(info, method), new Pair(info, controller) });
}) })
.filter(pair -> pair.second != null) .filter(pair -> pair.second != null)
.flatMap(pair -> { .flatMap(pair -> switch (matching) {
if ("ant_path_matcher".equals(matching)) { case "ant_path_matcher" ->
return Objects.requireNonNull(pair.first.getPatternsCondition().getPatterns()).stream(); Objects.requireNonNull(pair.first.getPatternsCondition().getPatterns()).stream();
} else if ("path_pattern_parser".equals(matching)) { case "path_pattern_parser" ->
return Objects.requireNonNull(pair.first.getPathPatternsCondition().getPatternValues()) Objects.requireNonNull(pair.first.getPathPatternsCondition().getPatternValues())
.stream(); .stream();
} else { default -> Objects.requireNonNull(pair.first.getPatternsCondition().getPatterns()).stream();
return Objects.requireNonNull(pair.first.getPatternsCondition().getPatterns()).stream();
}
}) })
.map(url -> RegExUtils.replaceAll(url, PATTERN, ASTERISK)) .map(url -> RegExUtils.replaceAll(url, PATTERN, ASTERISK))
.forEach(urls::add); .forEach(urls::add);