update content-service/disk

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/DiskFileController.java

@@ -74,7 +74,7 @@ public class DiskFileController {
         DiskQuery diskQuery = builder.build();
         PageList<FileInfo> pageList = diskFileService.findByDiskQuery(diskQuery);
         List<NamePath> namePathList = diskFileService.getPathList(path);
-        DiskInfo diskInfo = new DiskInfo(pageList, namePathList);
+        DiskInfo diskInfo = new DiskInfo(pid, pageList, namePathList);
         return WebResult.success(diskInfo);
     }
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/CreateFolder.java

@@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank;
 @Getter
 public class CreateFolder {
     @Length(min = 1, max = 255)
-    private String parentPath;
+    private String pid;
     @Length(min = 1, max = 255)
     private String folderName;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskInfo.java

@@ -11,6 +11,7 @@ import java.util.List;
  */
 @AllArgsConstructor
 public class DiskInfo {
+    private String currentPid;
     private PageList<FileInfo> pageList;
     private List<NamePath> namePathList;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskFolderService.java

@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class DiskFolderService {
-    private DiskFileService diskFileService;
+    private final DiskFileService diskFileService;
     private final DiskFileMapper diskFileMapper;
 
     public DiskFolderService(DiskFileService diskFileService, DiskFileMapper diskFileMapper) {
@@ -31,16 +31,13 @@ public class DiskFolderService {
     }
 
     public synchronized Result createFolder(CreateFolder createFolder) {
-        String parentPath = FileUtil.getCanonicalPath(createFolder.getParentPath());
-        String pid = "0";
-        if (!parentPath.equals("/")) {
-            DiskFile parentDiskFile = diskFileService.findByPath(parentPath);
-            if (parentDiskFile == null) {
-                return Result.fail("parent dir not exist");
-            }
-            pid = parentDiskFile.getFileId();
+        String pid = createFolder.getPid();
+        DiskFile parentDiskFile = diskFileService.findByFileId(pid);
+        if (parentDiskFile == null) {
+            return Result.fail("parent dir not exist");
         }
 
+        String parentPath = parentDiskFile.getPath();
         String folderName = createFolder.getFolderName();
         String folderPath = String.format("%s/%s", parentPath, folderName);
         String folderPath0 = FileUtil.getCanonicalPath(folderPath);