From 934bbe8bd7d56aad0356880a8cf1dfe3aee817e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:15:54 +0800
Subject: [PATCH] update springboot 3.4.1 => 3.4.2 update springdoc 2.8.3 => 2.8.4 update satoken 1.39.0 => 1.40.0 update redisson 3.43.0 => 3.44.0
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java
index b8b12d4..6dde129 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java
@@ -21,7 +21,8 @@
*/
public static String extractFromString(String input, String regex, String defaultInput) {
try {
- return ReUtil.get(regex, input, 1);
+ String str = ReUtil.get(regex, input, 1);
+ return str == null ? defaultInput : str;
} catch (Exception e) {
return defaultInput;
}
--
Gitblit v1.9.3