diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java index 6890bac..8770f8a 100644 --- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java @@ -155,7 +155,7 @@ public class EDDataServiceImpl implements EDDataService { { // 获取上级目录的名称 String fileName = edDataInfo.getDataName(); - Assert.isTrue(EleCommonUtil.isFileNameValid(fileName), "文件名不符合规范,只能包含中文字符、下划线、连字符、加号、数字和英文字符"); + Assert.isTrue(EleCommonUtil.isFileNameValid(fileName), "文件名不符合规范,只能包含中文字符、下划线、连字符、加号、数字和英文字符且长度小于32。"); Category categoryParent = new Category(); categoryParent.setCategoryId(edDataInfo.getCategoryId()); @@ -318,7 +318,7 @@ public class EDDataServiceImpl implements EDDataService { String fileType = EleCommonUtil.getFileType(fileFullName); // 获取文件名称 String fileName = EleCommonUtil.getFileName(fileFullName); - Assert.isTrue(EleCommonUtil.isFileNameValid(fileName), "文件名不符合规范,只能包含中文字符、下划线、连字符、加号、数字和英文字符"); + Assert.isTrue(EleCommonUtil.isFileNameValid(fileName), "文件名不符合规范,只能包含中文字符、下划线、连字符、加号、数字和英文字符且长度小于32。"); // 判断文件名称是否存在 EDDataParams folderParames = new EDDataParams(); folderParames.setParentId(categoryId); diff --git a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/EleCommonUtil.java b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/EleCommonUtil.java index 8eb0774..eb15bc2 100644 --- a/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/EleCommonUtil.java +++ b/electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/EleCommonUtil.java @@ -31,6 +31,9 @@ public final class EleCommonUtil { } public static boolean isFileNameValid(String fileFullName) { + if (fileFullName.length() > 32) { + return false; + } return pattern.matcher(fileFullName).matches(); }