增强导入工程时文件名的校验
This commit is contained in:
parent
17550692e2
commit
309dad6895
|
|
@ -1604,6 +1604,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
|
||||||
List<File> files = FileUtil.loopFiles(destDir);
|
List<File> files = FileUtil.loopFiles(destDir);
|
||||||
String tmpPath = FileUtil.normalize(destDir);
|
String tmpPath = FileUtil.normalize(destDir);
|
||||||
for (File importFile : files) {
|
for (File importFile : files) {
|
||||||
|
Assert.isTrue(EleCommonUtil.isFileNameValid(importFile.getName()), "文件名称不符合规范");
|
||||||
String parentDir = FileUtil.normalize(importFile.getParent());
|
String parentDir = FileUtil.normalize(importFile.getParent());
|
||||||
String relativeFilePath = parentDir.replace(tmpPath, "");
|
String relativeFilePath = parentDir.replace(tmpPath, "");
|
||||||
String fileType = FileUtil.getSuffix(importFile.getName());
|
String fileType = FileUtil.getSuffix(importFile.getName());
|
||||||
|
|
@ -1641,6 +1642,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
|
||||||
String suffix = FileUtil.getSuffix(originalFilename);
|
String suffix = FileUtil.getSuffix(originalFilename);
|
||||||
String mainName = FileUtil.mainName(originalFilename);
|
String mainName = FileUtil.mainName(originalFilename);
|
||||||
Assert.isTrue(StrUtil.equals(suffix, "zip"), "不支持 {} 格式的工程文件", suffix);
|
Assert.isTrue(StrUtil.equals(suffix, "zip"), "不支持 {} 格式的工程文件", suffix);
|
||||||
|
Assert.isTrue(EleCommonUtil.isFileNameValid(originalFilename), "项目名称不符合规范");
|
||||||
// 检查工程是否存在
|
// 检查工程是否存在
|
||||||
List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getFileName, mainName)
|
List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).eq(EdFileInfo::getFileName, mainName)
|
||||||
.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code)
|
.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue