From bf9f5d506d34cbbcc68f77cdf71e30a6cf3cd7d4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 八月 2023 13:50:07 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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 ff67722..9cf9aba 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) {
+ public List<MetaFileEntity> selectFiles(String subPath, boolean hasMd5) {
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 (!isExtValid(extName)) {
+ if (!isFileValid(f.getName())) {
continue;
}
@@ -154,7 +154,7 @@
mf.setExtName(extName);
mf.setSizes(FileHelper.sizeToMb(f.length()));
mf.setPath(subPath + File.separator + fileName);
- if (!StaticData.ZIP.equals(extName)) {
+ if (hasMd5 && !StaticData.ZIP.equals(extName)) {
mf.setGuid(FileHelper.getFileMd5(f.getPath()));
}
@@ -190,7 +190,7 @@
* 鏌ヨ鏄犲皠
*/
public List<MetaFileEntity> selectMappers(UserEntity ue, String path, DirEntity dir, VerEntity ver, String epsgCode) {
- List<MetaFileEntity> metas = selectFiles(path);
+ List<MetaFileEntity> metas = selectFiles(path, true);
if (null == metas || metas.isEmpty()) {
return null;
}
@@ -252,8 +252,7 @@
private void getFilesByPath(List<File> list, String path) {
File file = new File(path);
if (!file.isDirectory()) {
- String extName = FileHelper.getExtension(file);
- if (isExtValid(extName)) {
+ if (isFileValid(file.getName())) {
list.add(file);
}
return;
@@ -272,8 +271,7 @@
if (f.isDirectory()) {
getFilesByPath(list, f.getPath());
} else {
- String extName = FileHelper.getExtension(f);
- if (isExtValid(extName)) {
+ if (isFileValid(f.getName())) {
list.add(f);
}
}
@@ -281,10 +279,22 @@
}
/**
- * 鎵╁睍鏄惁鏈夋晥
+ * 鏂囦欢鏄�/鍚︽湁鏁�
*/
- private boolean isExtValid(String extName) {
- return StaticData.ALL_EXTENSION.contains(extName) && !StaticData.MAPPER_EXCLUDE_EXT.contains(extName);
+ private boolean isFileValid(String fileName) {
+ String extName = FileHelper.getExtension(fileName);
+ if (fileName.startsWith(StaticData.TILDE) || !StaticData.ALL_EXTENSION.contains(extName)) {
+ return false;
+ }
+
+ fileName = fileName.toLowerCase();
+ for (String ext : StaticData.MAPPER_EXCLUDE_EXT) {
+ if (fileName.contains(ext)) {
+ return false;
+ }
+ }
+
+ return true;
}
/**
@@ -301,8 +311,8 @@
}
String fileName = FileHelper.getFileName(f.getPath());
- String extName = FileHelper.getExtension(fileName);
- if (!isExtValid(extName) || fileName.startsWith("~")) {
+ String extName = isOsgb ? StaticData.OSGB : FileHelper.getExtension(fileName);
+ if (!isFileValid(f.getName())) {
continue;
}
--
Gitblit v1.9.3