|
@@ -40,7 +40,7 @@ public class VerifyUtil {
|
|
|
if (StringUtil.isBlank(text)) {
|
|
|
return false;
|
|
|
}
|
|
|
- String regex = "任|一|二|三|四|五|六|七|八|九|十|\\[||\\]|\\+|、|\\d";
|
|
|
+ String regex = "任|一|二|三|四|五|六|七|八|九|十|\\[||\\]|\\+|、|\\d|\\.";
|
|
|
for (int i = 0; i < text.length(); i++) {
|
|
|
String s1 = String.valueOf(text.charAt(i));
|
|
|
boolean flag = s1.matches(regex);
|
|
@@ -170,7 +170,7 @@ public class VerifyUtil {
|
|
|
* @return
|
|
|
*/
|
|
|
public static String verifyFormula(List<String> codeList, String s) {
|
|
|
- String errMsg = String.format("%s 公式格式错误; ",s);
|
|
|
+ String errMsg = String.format("%s公式格式错误; ", "【" + s + "】");
|
|
|
try {
|
|
|
// 1、校验是否包含无效字符
|
|
|
if (!verifyText(s)) {
|