Merge pull request #17 from TaleLin/fix/file-extension

fix:修复文件上传的视图不一致问题

Author: pedro

src/main/java/io/github/talelin/merak/bo/FileBO.java

@@ -5,18 +5,23 @@
 @Data
 public class FileBO {
 
+    /**
+     * 文件 id
+     */
     private Long id;
 
-    private String path;
-
     /**
-     * LOCAL(本地) 或 REMOTE(远程)
+     * 文件 key，上传时指定的
      */
-    private String type;
-
-    private String name;
+    private String key;
 
-    private String extension;
+    /**
+     * 文件路径
+     */
+    private String path;
 
-    private Integer size;
+    /**
+     * 文件 URL
+     */
+    private String url;
 }

src/main/java/io/github/talelin/merak/extensions/file/AbstractUploader.java

@@ -51,6 +51,7 @@ private void handleOneFile0(List<File> res, long singleFileLimit, MultipartFile
         File fileData = File.builder().
                 name(newFilename).
                 md5(md5).
+                key(file.getName()).
                 path(storePath).
                 size(bytes.length).
                 type(getFileType()).

src/main/java/io/github/talelin/merak/extensions/file/config.properties

@@ -14,4 +14,4 @@ lin.cms.file.domain=http://localhost:5000/
 # \u672C\u5730\u6587\u4EF6\u4FDD\u5B58\u4F4D\u7F6E
 lin.cms.file.store-dir=assets/
 # \u5B9E\u73B0
-lin.cms.file.uploader=local
+lin.cms.file.uploader=local

src/main/java/io/github/talelin/merak/service/impl/FileServiceImpl.java

@@ -3,7 +3,6 @@
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import io.github.talelin.merak.bo.FileBO;
-import io.github.talelin.merak.extensions.file.File;
 import io.github.talelin.merak.extensions.file.FileConstant;
 import io.github.talelin.merak.extensions.file.Uploader;
 import io.github.talelin.merak.mapper.FileMapper;
@@ -18,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author pedro
@@ -44,35 +42,39 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileDO> implements
      */
     @Override
     public List<FileBO> upload(MultiValueMap<String, MultipartFile> fileMap) {
-        List<FileDO> tmp = new ArrayList<>();
-        List<File> files = uploader.upload(fileMap, file -> {
+        List<FileBO> res = new ArrayList<>();
+        uploader.upload(fileMap, file -> {
             FileDO found = this.baseMapper.selectByMd5(file.getMd5());
-            if (found == null)
+            // 数据库中不存在
+            if (found == null) {
+                FileDO fileDO = new FileDO();
+                BeanUtil.copyProperties(file, fileDO);
+                this.getBaseMapper().insert(fileDO);
+                res.add(transformDoToBo(fileDO, file.getKey()));
                 return true;
-            tmp.add(found);
+            }
+            // 已存在，则直接转化返回
+            res.add(transformDoToBo(found, file.getKey()));
             return false;
         });
-        tmp.addAll(files.stream().map(file -> {
-            FileDO fileDO = new FileDO();
-            BeanUtil.copyProperties(file, fileDO);
-            this.getBaseMapper().insert(fileDO);
-            return fileDO;
-        }).collect(Collectors.toList()));
-
-        List<FileBO> res = tmp.stream().map(file -> {
-            FileBO bo = new FileBO();
-            BeanUtil.copyProperties(file, bo);
-            if (file.getType().equals(FileConstant.LOCAL)) {
-                String s = FileUtil.mainName(dir);
-                bo.setPath(domain + s + "/" + file.getName());
-            }
-            return bo;
-        }).collect(Collectors.toList());
         return res;
     }
 
     @Override
     public boolean checkFileExistByMd5(String md5) {
         return this.getBaseMapper().selectCountByMd5(md5) > 0;
     }
+
+    private FileBO transformDoToBo(FileDO file, String key) {
+        FileBO bo = new FileBO();
+        BeanUtil.copyProperties(file, bo);
+        if (file.getType().equals(FileConstant.LOCAL)) {
+            String s = FileUtil.mainName(dir);
+            bo.setUrl(domain + s + "/" + file.getName());
+        } else {
+            bo.setUrl(file.getPath());
+        }
+        bo.setKey(key);
+        return bo;
+    }
 }