|
@@ -18,6 +18,7 @@ import java.util.Map;
|
|
18
|
import java.util.Set;
|
18
|
import java.util.Set;
|
|
19
|
import java.util.stream.Collectors;
|
19
|
import java.util.stream.Collectors;
|
|
20
|
import javax.servlet.http.HttpServletResponse;
|
20
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
21
|
+import org.apache.commons.lang3.RegExUtils;
|
|
21
|
import org.apache.poi.ss.usermodel.BorderStyle;
|
22
|
import org.apache.poi.ss.usermodel.BorderStyle;
|
|
22
|
import org.apache.poi.ss.usermodel.Cell;
|
23
|
import org.apache.poi.ss.usermodel.Cell;
|
|
23
|
import org.apache.poi.ss.usermodel.CellStyle;
|
24
|
import org.apache.poi.ss.usermodel.CellStyle;
|
|
@@ -65,6 +66,8 @@ public class ExcelUtil<T>
|
|
65
|
{
|
66
|
{
|
|
66
|
private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
|
67
|
private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
|
|
67
|
|
68
|
|
|
|
|
69
|
+ public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
|
|
|
|
70
|
+
|
|
68
|
public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
|
71
|
public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
|
|
69
|
|
72
|
|
|
70
|
/**
|
73
|
/**
|
|
@@ -595,9 +598,9 @@ public class ExcelUtil<T>
|
|
595
|
{
|
598
|
{
|
|
596
|
String cellValue = Convert.toStr(value);
|
599
|
String cellValue = Convert.toStr(value);
|
|
597
|
// 对于任何以表达式触发字符 =-+@开头的单元格,直接使用tab字符作为前缀,防止CSV注入。
|
600
|
// 对于任何以表达式触发字符 =-+@开头的单元格,直接使用tab字符作为前缀,防止CSV注入。
|
|
598
|
- if (StringUtils.containsAny(cellValue, FORMULA_STR))
|
|
|
|
|
|
601
|
+ if (StringUtils.startsWithAny(cellValue, FORMULA_STR))
|
|
599
|
{
|
602
|
{
|
|
600
|
- cellValue = StringUtils.replaceEach(cellValue, FORMULA_STR, new String[] { "\t=", "\t-", "\t+", "\t@" });
|
|
|
|
|
|
603
|
+ cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");
|
|
601
|
}
|
604
|
}
|
|
602
|
cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
|
605
|
cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
|
|
603
|
}
|
606
|
}
|