From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期三, 12 三月 2025 09:35:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X --- ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java index dd6ebb1..0363ad4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java @@ -4,8 +4,6 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import org.springframework.util.AntPathMatcher; import java.util.*; @@ -17,12 +15,15 @@ * * @author Lion Li */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) public class StringUtils extends org.apache.commons.lang3.StringUtils { public static final String SEPARATOR = ","; public static final String SLASH = "/"; + + @Deprecated + private StringUtils() { + } /** * 鑾峰彇鍙傛暟涓嶄负绌哄�� @@ -317,7 +318,25 @@ .stream() .filter(Objects::nonNull) .map(mapper) + .filter(Objects::nonNull) .collect(Collectors.toList()); } + /** + * 涓嶅尯鍒嗗ぇ灏忓啓妫�鏌� CharSequence 鏄惁浠ユ寚瀹氱殑鍓嶇紑寮�澶淬�� + * + * @param str 瑕佹鏌ョ殑 CharSequence 鍙兘涓� null + * @param prefixs 瑕佹煡鎵剧殑鍓嶇紑鍙兘涓� null + * @return 鏄惁鍖呭惈 + */ + public static boolean startWithAnyIgnoreCase(CharSequence str, CharSequence... prefixs) { + // 鍒ゆ柇鏄惁鏄互鎸囧畾瀛楃涓插紑澶� + for (CharSequence prefix : prefixs) { + if (StringUtils.startsWithIgnoreCase(str, prefix)) { + return true; + } + } + return false; + } + } -- Gitblit v1.9.3