From 5e6fd0d1e148554c94d30ba7ed4ffe2eddc07c78 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 12 Feb 2022 11:56:02 +0800
Subject: [PATCH] !429 修复自定义组件`file-upload`无法显示第一个文件，列表显示的文件比实际文件少一个的问题 Merge pull request !429 from hjk2008/master
---
ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
index 4316372..34d0700 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.xss;
+import com.ruoyi.common.utils.StringUtils;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.util.regex.Matcher;
@@ -12,15 +13,19 @@
*/
public class XssValidator implements ConstraintValidator<Xss, String>
{
- private final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />";
+ private static final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />";
@Override
public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext)
{
+ if (StringUtils.isBlank(value))
+ {
+ return true;
+ }
return !containsHtml(value);
}
- public boolean containsHtml(String value)
+ public static boolean containsHtml(String value)
{
Pattern pattern = Pattern.compile(HTML_PATTERN);
Matcher matcher = pattern.matcher(value);
--
Gitblit v1.9.2