From 2f380f0c4177d02010759c0ecf0c63543bb90157 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Fri, 26 Aug 2022 08:42:03 +0800
Subject: [PATCH] !564 修复执行任务时，若方法入口在任务的父类，则无法执行的问题 Merge pull request !564 from 捏造的信仰/fix-issue-I5NNXI
---
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