From 39a0c7d19f9712861ca3e1cadab575bada16e717 Mon Sep 17 00:00:00 2001
From: D <3066417822@qq.com>
Date: Thu, 28 Mar 2024 19:47:15 +0800
Subject: [PATCH] update

---
 pom.xml                                            |  3 ++-
 .../config/properties/PermitAllUrlProperties.java  | 14 ++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b52234..93e4adb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.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>
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
@@ -44,7 +45,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.2.1</version>
+                <version>${spring-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java
index 090cc87..d90025c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java
@@ -62,15 +62,13 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont
                     return Arrays.stream(new Pair[] { new Pair(info, method), new Pair(info, controller) });
                 })
                 .filter(pair -> pair.second != null)
-                .flatMap(pair -> {
-                    if ("ant_path_matcher".equals(matching)) {
-                        return Objects.requireNonNull(pair.first.getPatternsCondition().getPatterns()).stream();
-                    } else if ("path_pattern_parser".equals(matching)) {
-                        return Objects.requireNonNull(pair.first.getPathPatternsCondition().getPatternValues())
+                .flatMap(pair -> switch (matching) {
+                    case "ant_path_matcher" ->
+                        Objects.requireNonNull(pair.first.getPatternsCondition().getPatterns()).stream();
+                    case "path_pattern_parser" ->
+                        Objects.requireNonNull(pair.first.getPathPatternsCondition().getPatternValues())
                                 .stream();
-                    } else {
-                        return Objects.requireNonNull(pair.first.getPatternsCondition().getPatterns()).stream();
-                    }
+                    default -> Objects.requireNonNull(pair.first.getPatternsCondition().getPatterns()).stream();
                 })
                 .map(url -> RegExUtils.replaceAll(url, PATTERN, ASTERISK))
                 .forEach(urls::add);