reghao 2 years ago
parent
commit
08e73a697e

+ 11 - 5
dfs-store/src/main/java/cn/reghao/dfs/store/controller/ObjectUploadController.java

@@ -94,12 +94,18 @@ public class ObjectUploadController {
 
 
         ObjectProp objectProp = objectNameService.getObjectProp(channelId, filename);
         ObjectProp objectProp = objectNameService.getObjectProp(channelId, filename);
         ObjectResult objectResult = putObjectService.putObject(objectProp, contentId, savedFile, filename, sha256sum1);
         ObjectResult objectResult = putObjectService.putObject(objectProp, contentId, savedFile, filename, sha256sum1);
-        UploadFileRet uploadFileRet = fileProcessor.process(objectResult, channelId);
-        if (uploadFileRet == null) {
-            putObjectService.deleteObject(objectResult.getObjectId());
-            return WebResult.fail();
+        UploadFileRet uploadFileRet;
+        try {
+            uploadFileRet = fileProcessor.process(objectResult, channelId);
+            if (uploadFileRet != null) {
+                return WebResult.success(uploadFileRet);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         }
-        return WebResult.success(uploadFileRet);
+
+        putObjectService.deleteObject(objectResult.getObjectId());
+        return WebResult.fail();
     }
     }
 
 
     @AuthUser
     @AuthUser