Merge remote-tracking branch 'origin/master'

jetlinks · Dec 28, 2023 · 2705830 · 2705830
2 parents 0b6c845 + 454fa46
commit 2705830
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/...ponents/io-component/src/main/java/org/jetlinks/community/io/file/ClusterFileManager.java b/...ponents/io-component/src/main/java/org/jetlinks/community/io/file/ClusterFileManager.java
@@ -248,6 +248,16 @@ public Flux<DataBuffer> read(String id, Function<ReaderContext, Mono<Void>> befo
             });
     }
 
+    @Override
+    public Mono<Integer> delete(String id) {
+        return doDelete(id);
+    }
+
+    public Mono<Integer> doDelete(String id) {
+        return repository
+            .deleteById(id);
+    }
+
     @EventListener
     public void handleDeleteEvent(EntityDeletedEvent<FileEntity> event) {
         for (FileEntity fileEntity : event.getEntity()) {

diff --git a/...nks-components/io-component/src/main/java/org/jetlinks/community/io/file/FileManager.java b/...nks-components/io-component/src/main/java/org/jetlinks/community/io/file/FileManager.java
@@ -29,6 +29,8 @@ public interface FileManager {
     Flux<DataBuffer> read(String id,
                           Function<ReaderContext, Mono<Void>> beforeRead);
 
+    Mono<Integer> delete(String id);
+
     interface ReaderContext {
         FileInfo info();
 

diff --git a/.../io-component/src/main/java/org/jetlinks/community/io/file/web/FileManagerController.java b/.../io-component/src/main/java/org/jetlinks/community/io/file/web/FileManagerController.java
@@ -5,6 +5,8 @@
 import lombok.AllArgsConstructor;
 import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.authorization.annotation.Authorize;
+import org.hswebframework.web.authorization.annotation.DeleteAction;
+import org.hswebframework.web.authorization.annotation.Resource;
 import org.hswebframework.web.authorization.exception.AccessDenyException;
 import org.jetlinks.community.io.file.FileInfo;
 import org.jetlinks.community.io.file.FileManager;
@@ -24,6 +26,7 @@
 @RestController
 @RequestMapping("/file")
 @AllArgsConstructor
+@Resource(id= "file-manager",name = "文件管理")
 @Tag(name = "需身份认证的文件管理")
 public class FileManagerController {
 
@@ -100,4 +103,13 @@ public Mono<Void> read(@PathVariable String fileId,
 
                            }));
     }
+
+    @DeleteMapping("/{fileId}")
+    @DeleteAction
+    @Operation(summary = "删除文件")
+    public Mono<Integer> delete(@PathVariable String fileId) {
+        return fileManager
+            .delete(fileId);
+    }
+
 }