浏览代码

优化说明

zhou-hao 7 年之前
父节点
当前提交
5b15a42390

+ 13 - 5
hsweb-system/hsweb-system-dev-tools/src/main/java/org/hswebframework/web/dev/tools/reader/FileInfo.java

@@ -1,5 +1,7 @@
 package org.hswebframework.web.dev.tools.reader;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.File;
@@ -9,29 +11,35 @@ import java.io.File;
  * @since 3.0
  */
 @Data
+@ApiModel("文件信息")
 public class FileInfo {
+
+    @ApiModelProperty("文件名")
     private String name;
 
+    @ApiModelProperty("文件长度")
     private Long length;
 
+    @ApiModelProperty("父目录")
     private String parent;
 
+    @ApiModelProperty("文件长度")
     private String absolutePath;
 
-    private String type;
-
+    @ApiModelProperty("是否为文件")
     private boolean file;
 
+    @ApiModelProperty("是否为目录")
     private boolean dir;
 
-    public static FileInfo from(File file){
-        FileInfo info=new FileInfo();
+    public static FileInfo from(File file) {
+        FileInfo info = new FileInfo();
         info.setName(file.getName());
         info.setLength(file.length());
         info.setParent(file.getParent());
         info.setAbsolutePath(file.getAbsolutePath());
         info.setFile(file.isFile());
         info.setDir(file.isDirectory());
-        return  info;
+        return info;
     }
 }

+ 2 - 2
hsweb-system/hsweb-system-dev-tools/src/main/java/org/hswebframework/web/dev/tools/web/FileManagerDevToolsController.java

@@ -48,7 +48,7 @@ public class FileManagerDevToolsController {
     public ResponseMessage<List<FileInfo>> write(@RequestParam String path) {
         File file = new File(path);
         if (!file.exists()) {
-            return null;
+            return ResponseMessage.error(404,"文件不存在");
         }
         List<FileInfo> list;
         if (file.isDirectory()) {
@@ -73,7 +73,7 @@ public class FileManagerDevToolsController {
     public ResponseMessage<String> read(@RequestParam String file) {
         File fileInfo = new File(file);
         if (!fileInfo.exists()) {
-            return null;
+            return ResponseMessage.error(404,"文件不存在");
         }
         if (fileInfo.length() > 2 * 1024 * 1024 * 1024L) {
             return ResponseMessage.error(500, "文件过大,无法读取");