diff --git a/src/main/java/com/ruoyi/common/validation/XssValidator.java b/src/main/java/com/ruoyi/common/validation/XssValidator.java index 2b25bfe..9b72691 100644 --- a/src/main/java/com/ruoyi/common/validation/XssValidator.java +++ b/src/main/java/com/ruoyi/common/validation/XssValidator.java @@ -1,5 +1,6 @@ package com.ruoyi.common.validation; +import com.ruoyi.common.utils.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.util.regex.Matcher; @@ -12,15 +13,19 @@ import java.util.regex.Pattern; */ public class XssValidator implements ConstraintValidator { - 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); diff --git a/src/main/java/com/ruoyi/project/system/domain/SysMenu.java b/src/main/java/com/ruoyi/project/system/domain/SysMenu.java index 68fb0ee..90e0a45 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysMenu.java +++ b/src/main/java/com/ruoyi/project/system/domain/SysMenu.java @@ -7,6 +7,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.web.domain.BaseEntity; /**