From de5c10c0c692dc3cad552821ca78f7ddb4074491 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 二月 2023 16:41:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index 59d474e..b7c21c7 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -129,7 +129,7 @@
/**
* 鏌ヨ鏂囦欢
*/
- public List<MetaFileEntity> selectFiles(String subPath, List<String> extList) {
+ public List<MetaFileEntity> selectFiles(String subPath) {
String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
File file = new File(root);
@@ -145,7 +145,7 @@
for (File f : files) {
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (null != extList && !extList.contains(extName)) {
+ if (!isExtValid(extName)) {
continue;
}
@@ -190,7 +190,7 @@
* 鏌ヨ鏄犲皠
*/
public List<MetaFileEntity> selectMappers(UserEntity ue, String path, DirEntity dir, VerEntity ver, String epsgCode) {
- List<MetaFileEntity> metas = selectFiles(path, StaticData.ALL_EXTENSION);
+ List<MetaFileEntity> metas = selectFiles(path);
if (null == metas || metas.isEmpty()) {
return null;
}
@@ -252,7 +252,7 @@
File file = new File(path);
if (!file.isDirectory()) {
String extName = FileHelper.getExtension(file);
- if (StaticData.ALL_EXTENSION.contains(extName)) {
+ if (isExtValid(extName)) {
list.add(file);
}
return;
@@ -272,11 +272,18 @@
getFilesByPath(list, f.getPath());
} else {
String extName = FileHelper.getExtension(f);
- if (StaticData.ALL_EXTENSION.contains(extName)) {
+ if (isExtValid(extName)) {
list.add(f);
}
}
}
+ }
+
+ /**
+ * 鎵╁睍鏄惁鏈夋晥
+ */
+ private boolean isExtValid(String extName) {
+ return StaticData.ALL_EXTENSION.contains(extName) && !StaticData.MAPPER_EXCLUDE_EXT.contains(extName);
}
/**
@@ -292,7 +299,7 @@
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (!StaticData.ALL_EXTENSION.contains(extName) || fileName.startsWith("~")) {
+ if (!isExtValid(extName) || fileName.startsWith("~")) {
continue;
}
--
Gitblit v1.9.3