From 60c815ab76306c6edf1e1f8511b14c168761a9c9 Mon Sep 17 00:00:00 2001
From: JuJu <857815116@qq.com>
Date: Sun, 28 Feb 2021 17:21:02 +0800
Subject: [PATCH] 修复部分更新方法过滤失败与单*匹配不精确问题
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java | 139 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 139 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
index a0d0c91..954dd03 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.core.utils;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
import com.ruoyi.common.core.text.StrFormatter;
@@ -16,6 +17,12 @@
/** 下划线 */
private static final char SEPARATOR = '_';
+
+ /** 星号 */
+ private static final String START = "*";
+
+ /** 斜杠 */
+ private static final String SLASH = "/";
/**
* 获取参数不为空值
@@ -396,6 +403,138 @@
return sb.toString();
}
+ /**
+ * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+ *
+ * @param str 指定字符串
+ * @param strs 需要检查的字符串数组
+ * @return 是否匹配
+ */
+ public static boolean matches(String str, List<String> strs)
+ {
+ if (isEmpty(str) || isEmpty(strs))
+ {
+ return false;
+ }
+ for (String testStr : strs)
+ {
+ if (matches(str, testStr))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 查找指定字符串是否匹配指定字符串数组中的任意一个字符串
+ *
+ * @param str 指定字符串
+ * @param strs 需要检查的字符串数组
+ * @return 是否匹配
+ */
+ public static boolean matches(String str, String... strs)
+ {
+ if (isEmpty(str) || isEmpty(strs))
+ {
+ return false;
+ }
+ for (String testStr : strs)
+ {
+ if (matches(str, testStr))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 查找指定字符串是否匹配
+ *
+ * @param str 指定字符串
+ * @param pattern 需要检查的字符串
+ * @return 是否匹配
+ */
+ public static boolean matches(String str, String pattern)
+ {
+ if (isEmpty(pattern) || isEmpty(str))
+ {
+ return false;
+ }
+
+ pattern = pattern.replaceAll("\\s*", ""); // 替换空格
+ int beginOffset = 0; // pattern截取开始位置
+ int formerStarOffset = -1; // 前星号的偏移位置
+ int latterStarOffset = -1; // 后星号的偏移位置
+
+ String remainingURI = str;
+ String prefixPattern = "";
+ String suffixPattern = "";
+
+ boolean result = false;
+ do
+ {
+ formerStarOffset = indexOf(pattern, START, beginOffset);
+ prefixPattern = substring(pattern, beginOffset, formerStarOffset > -1 ? formerStarOffset : pattern.length());
+
+ // 匹配前缀Pattern
+ result = remainingURI.contains(prefixPattern);
+
+ // 匹配失败，直接返回
+ if (!result)
+ return false;
+
+ // 已经没有星号，判断长度是否符合，并返回
+ if (formerStarOffset == -1)
+ {
+ // 清洗请求路径
+ if (remainingURI.endsWith(SLASH)) {
+ remainingURI = remainingURI.substring(0, remainingURI.length() - 1);
+ }
+ return remainingURI.length() == prefixPattern.length();
+ }
+
+ if (!isEmpty(prefixPattern))
+ {
+ // 如果前面还有路径 直接返回
+ if (!isEmpty(substringBefore(str, prefixPattern))) {
+ return false;
+ }
+ remainingURI = substringAfter(str, prefixPattern);
+ }
+
+ // 匹配后缀Pattern
+ latterStarOffset = indexOf(pattern, START, formerStarOffset + 1);
+ suffixPattern = substring(pattern, formerStarOffset + 1, latterStarOffset > -1 ? latterStarOffset : pattern.length());
+
+ // 判断是否存在第二个 *
+ if (latterStarOffset == -1) {
+ // 判断是否还包含斜杠
+ if(remainingURI.contains(SLASH)) {
+ return false;
+ }
+ }
+
+ result = remainingURI.contains(suffixPattern);
+ // 匹配失败，直接返回
+ if (!result)
+ return false;
+
+ if (!isEmpty(suffixPattern))
+ {
+ remainingURI = substringAfter(str, suffixPattern);
+ }
+
+ // 移动指针
+ beginOffset = latterStarOffset + 1;
+
+ }
+ while (!isEmpty(suffixPattern) && !isEmpty(remainingURI));
+
+ return true;
+ }
+
@SuppressWarnings("unchecked")
public static <T> T cast(Object obj)
{
--
Gitblit v1.9.3