From 7421d7cccee99d7c60a0c8af8e7e6aeabc2f2666 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Wed, 29 Mar 2023 10:44:23 +0800
Subject: [PATCH] !313 异步保存日志的时候，报错被吞 ，导致没跑进RemoteLogFallbackFactory中 Merge pull request !313 from Llorando/master
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
index c7dfde9..92405c2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
@@ -1,9 +1,10 @@
package com.ruoyi.common.core.xss;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import com.ruoyi.common.core.utils.StringUtils;
/**
* 自定义xss校验注解实现
@@ -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.3