文件处理

yzg-util-file/src/main/java/com/yanzuoguang/cloud/file/YzgFileServiceImpl.java

@@ -43,14 +43,7 @@ public class YzgFileServiceImpl implements YzgFileService {
         if (req.getFile() == null || req.getFile().length == 0) {
             throw new CodeException("请上传文件");
         }
-        String folder = StringHelper.getFirst(req.getFolder(), "temp");
-        if (folder.contains("..")) {
-            throw new CodeException("文件夹不能包含两个.");
-        }
-        if (folder.contains("\\u")) {
-            throw new CodeException("文件夹不能包含\\u");
-        }
-
+        String folder = getTempFolder(req.getFolder());
         for (MultipartFile uploadFile : req.getFile()) {
             // 获取上传源文件名和扩展名
             String originalFilename = uploadFile.getOriginalFilename();
@@ -91,6 +84,7 @@ public class YzgFileServiceImpl implements YzgFileService {
      */
     @Override
     public void removeTempFolder(String tempFolder) {
+        tempFolder = getTempFolder(tempFolder);
         // 设置标记
         synchronized (cacheRemoveTempFolder) {
             if (StringHelper.toBoolean(cacheRemoveTempFolder.get(tempFolder))) {
@@ -98,7 +92,6 @@ public class YzgFileServiceImpl implements YzgFileService {
             }
             cacheRemoveTempFolder.put(tempFolder, true);
         }
-
         try {
             // 删除当前临时目录
             FileHelper.deleteFolder(tempFolder);
@@ -127,4 +120,16 @@ public class YzgFileServiceImpl implements YzgFileService {
         );
         return ret;
     }
+
+    private String checkFolder(String folderFrom) {
+        String folder = StringHelper.getFirst(folderFrom, "temp");
+        if (folder.contains("..")) {
+            throw new CodeException("文件夹不能包含两个.");
+        }
+        if (folder.contains("\\u")) {
+            throw new CodeException("文件夹不能包含\\u");
+        }
+        return folder;
+
+    }
 }