修复配置界面中下拉选择检索条件,js使用el表达式赋值时存在html特殊字符未转换问题;

导入字符串字段增加escapeHtml4转换;
域名校验不使用完整的域名格式校验。

(cherry picked from commit a1f8e1779a)
This commit is contained in:
duandongmei
2019-01-21 08:46:57 +00:00
committed by 王鑫
parent e412d22569
commit f8a90c0c8f
3 changed files with 10 additions and 4 deletions

View File

@@ -20,6 +20,7 @@ import java.util.concurrent.BlockingQueue;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
@@ -468,7 +469,7 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
if(StringUtils.endsWith(s, ".0") && !s.endsWith("0.0.0.0")){
val = StringUtils.substringBefore(s, ".0");
}else{
val = String.valueOf(val.toString().trim());
val=val == null ? "" : StringEscapeUtils.escapeHtml4(val.toString().trim());
}
}else if (valType == Integer.class){
val = Double.valueOf(val.toString().trim()).intValue();