fix issue #131

Author: fuhao

src/main/java/io/github/talelin/latticy/module/file/AbstractUploader.java

@@ -18,7 +18,7 @@
  */
 public abstract class AbstractUploader implements Uploader {
 
-    private PreHandler preHandler;
+    private UploadHandler uploadHandler;
 
     @Override
     public List<File> upload(MultiValueMap<String, MultipartFile> fileMap) {
@@ -29,8 +29,8 @@ public List<File> upload(MultiValueMap<String, MultipartFile> fileMap) {
     }
 
     @Override
-    public List<File> upload(MultiValueMap<String, MultipartFile> fileMap, PreHandler preHandler) {
-        this.preHandler = preHandler;
+    public List<File> upload(MultiValueMap<String, MultipartFile> fileMap, UploadHandler uploadHandler) {
+        this.uploadHandler = uploadHandler;
         return this.upload(fileMap);
     }
 
@@ -64,12 +64,16 @@ private void handleOneFile0(List<File> res, long singleFileLimit, MultipartFile
                 extension(ext).
                 build();
         // 如果预处理器不为空，且处理结果为false，直接返回, 否则处理
-        if (preHandler != null && !preHandler.handle(fileData)) {
+        if (uploadHandler != null && !uploadHandler.preHandle(fileData)) {
             return;
         }
         boolean ok = handleOneFile(bytes, newFilename);
         if (ok) {
             res.add(fileData);
+            // 上传到本地或云上成功之后，调用afterHandle
+            if (uploadHandler != null) {
+                uploadHandler.afterHandle(fileData);
+            }
         }
     }
 

…elin/latticy/module/file/PreHandler.java …n/latticy/module/file/UploadHandler.javasrc/main/java/io/github/talelin/latticy/module/file/PreHandler.java renamed to src/main/java/io/github/talelin/latticy/module/file/UploadHandler.java src/main/java/io/github/talelin/latticy/module/file/PreHandler.java renamed to src/main/java/io/github/talelin/latticy/module/file/UploadHandler.java

@@ -5,12 +5,17 @@
  *
  * @author pedro@TaleLin
  */
-public interface PreHandler {
+public interface UploadHandler {
 
     /**
      * 在文件写入本地或者上传到云之前调用此方法
      *
      * @return 是否上传，若返回false，则不上传
      */
-    boolean handle(File file);
+    boolean preHandle(File file);
+
+    /**
+     * 在文件写入本地或者上传到云之后调用此方法
+     */
+    void afterHandle(File file);
 }

src/main/java/io/github/talelin/latticy/module/file/Uploader.java

@@ -24,8 +24,8 @@ public interface Uploader {
      * 上传文件
      *
      * @param fileMap    文件map
-     * @param preHandler 预处理器
+     * @param uploadHandler 预处理器
      * @return 文件数据
      */
-    List<File> upload(MultiValueMap<String, MultipartFile> fileMap, PreHandler preHandler);
+    List<File> upload(MultiValueMap<String, MultipartFile> fileMap, UploadHandler uploadHandler);
 }

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

@@ -4,9 +4,7 @@
 import io.github.talelin.latticy.bo.FileBO;
 import io.github.talelin.latticy.mapper.FileMapper;
 import io.github.talelin.latticy.model.FileDO;
-import io.github.talelin.latticy.module.file.FileConstant;
-import io.github.talelin.latticy.module.file.FileProperties;
-import io.github.talelin.latticy.module.file.Uploader;
+import io.github.talelin.latticy.module.file.*;
 import io.github.talelin.latticy.service.FileService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,19 +41,29 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileDO> implements
     @Override
     public List<FileBO> upload(MultiValueMap<String, MultipartFile> fileMap) {
         List<FileBO> res = new ArrayList<>();
-        uploader.upload(fileMap, file -> {
-            FileDO found = this.baseMapper.selectByMd5(file.getMd5());
-            // 数据库中不存在
-            if (found == null) {
+
+        uploader.upload(fileMap, new UploadHandler() {
+            @Override
+            public boolean preHandle(File file) {
+                FileDO found = baseMapper.selectByMd5(file.getMd5());
+                // 数据库中不存在，存储操作放在上传到本地或云上之后，
+                // 修复issue131：https://github.com/TaleLin/lin-cms-spring-boot/issues/131
+                if (found == null) {
+                    return true;
+                }
+                // 已存在，则直接转化返回
+                res.add(transformDoToBo(found, file.getKey()));
+                return false;
+            }
+
+            @Override
+            public void afterHandle(File file) {
+                // 保存到数据库, 修复issue131：https://github.com/TaleLin/lin-cms-spring-boot/issues/131
                 FileDO fileDO = new FileDO();
                 BeanUtils.copyProperties(file, fileDO);
-                this.getBaseMapper().insert(fileDO);
+                getBaseMapper().insert(fileDO);
                 res.add(transformDoToBo(fileDO, file.getKey()));
-                return true;
             }
-            // 已存在，则直接转化返回
-            res.add(transformDoToBo(found, file.getKey()));
-            return false;
         });
         return res;
     }