文件处理

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

@@ -43,7 +43,7 @@ public class YzgFileServiceImpl implements YzgFileService {
         if (req.getFile() == null || req.getFile().length == 0) {
             throw new CodeException("请上传文件");
         }
-        String folder = getTempFolder(req.getFolder());
+        String folder = checkFolder(req.getFolder());
         for (MultipartFile uploadFile : req.getFile()) {
             // 获取上传源文件名和扩展名
             String originalFilename = uploadFile.getOriginalFilename();
@@ -94,7 +94,7 @@ public class YzgFileServiceImpl implements YzgFileService {
             cacheRemoveTempFolder.put(toFolder, true);
         }
         try {
-            // 删除当前临时目录
+            // 删除当前临时目录+子文件
             FileHelper.deleteFolder(toFolder);
             // 父文件夹不存在子文件时则删除
             File file = new File(toFolder);
@@ -114,7 +114,8 @@ public class YzgFileServiceImpl implements YzgFileService {
      * @return
      */
     private String getTempFolder(String folder) {
-        String ret = String.format("%s/%s/%s/%s/", folder,
+        String ret = String.format("%s/%s/%s/%s",
+                folder,
                 DateHelper.getDateTimeString("yyyy", new Date()),
                 DateHelper.getDateTimeString("MM", new Date()),
                 DateHelper.getDateTimeString("dd", new Date())