将 content-service 的 disk 包迁移到 file-service

file/file-service/src/main/java/cn/reghao/tnb/file/app/util/IdService.java

@@ -0,0 +1,35 @@
+package cn.reghao.tnb.file.app.util;
+
+import cn.reghao.jutil.tool.id.SnowFlake;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+/**
+ * ID 生成服务
+ *
+ * @author reghao
+ * @date 2025-09-05 17:07:53
+ */
+@Component
+public class IdService {
+    private final SnowFlake idGenerator;
+    private int dcId = 1;
+    private int machineId = 1;
+
+    public IdService() {
+        this.idGenerator = new SnowFlake(dcId, machineId);
+    }
+
+    public long getLongId() {
+        return idGenerator.nextId();
+    }
+
+    public String getStringId() {
+        return null;
+    }
+
+    public String getFileId() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+}

file/file-service/src/main/java/cn/reghao/tnb/file/app/util/RandomUtil.java

@@ -0,0 +1,38 @@
+package cn.reghao.tnb.file.app.util;
+
+import java.security.SecureRandom;
+import java.util.Random;
+
+/**
+ * @author reghao
+ * @date 2025-08-19 15:21:06
+ */
+public class RandomUtil {
+    private final static Random random = new SecureRandom();
+
+    public static int getRandomNumber(int max) {
+        int min = 0;
+        return min + random.nextInt(max - min);
+    }
+
+    /**
+     * 产生两个数之间的随机数
+     *
+     * @param min 最小值
+     * @param max 最大值
+     * @return 随机数
+     */
+    public static int getNumber(int min, int max) {
+        return min + random.nextInt(max - min);
+    }
+
+    /**
+     * 产生0-num的随机数,不包括num
+     *
+     * @param num 最大值
+     * @return 随机数
+     */
+    public static int getNumber(int num) {
+        return random.nextInt(num);
+    }
+}

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/CamController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/CamController.java

@@ -1,14 +1,17 @@
-package cn.reghao.tnb.content.app.disk.controller;
+package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.content.app.disk.model.dto.CamDeviceDto;
-import cn.reghao.tnb.content.app.disk.model.dto.CamRecordDto;
-import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
-import cn.reghao.tnb.content.app.disk.model.vo.*;
-import cn.reghao.tnb.content.app.disk.service.CamRecordService;
-import cn.reghao.tnb.content.app.disk.service.CamService;
+import cn.reghao.tnb.file.app.zdisk.model.dto.CamDeviceDto;
+import cn.reghao.tnb.file.app.zdisk.model.dto.CamRecordDto;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
+import cn.reghao.tnb.file.app.zdisk.model.vo.CamDetail;
+import cn.reghao.tnb.file.app.zdisk.model.vo.CamRecordDetail;
+import cn.reghao.tnb.file.app.zdisk.model.vo.CamRecordInfo;
+import cn.reghao.tnb.file.app.zdisk.model.vo.CamSearch;
+import cn.reghao.tnb.file.app.zdisk.service.CamRecordService;
+import cn.reghao.tnb.file.app.zdisk.service.CamService;
 import cn.reghao.tnb.common.db.SelectOption;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/DiskAlbumController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskAlbumController.java

@@ -1,16 +1,16 @@
-package cn.reghao.tnb.content.app.disk.controller;
+package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.content.app.disk.model.dto.AlbumEdit;
-import cn.reghao.tnb.content.app.disk.model.dto.AlbumCreate;
-import cn.reghao.tnb.content.app.disk.model.vo.DiskAlbumDetail;
-import cn.reghao.tnb.content.app.disk.model.vo.DiskAlbumInfo;
-import cn.reghao.tnb.content.app.disk.model.vo.DiskFileDetail;
-import cn.reghao.tnb.content.app.disk.service.DiskAlbumService;
+import cn.reghao.tnb.file.app.zdisk.model.dto.AlbumEdit;
+import cn.reghao.tnb.file.app.zdisk.model.dto.AlbumCreate;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskAlbumDetail;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskAlbumInfo;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskFileDetail;
+import cn.reghao.tnb.file.app.zdisk.service.DiskAlbumService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

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

@@ -1,15 +1,18 @@
-package cn.reghao.tnb.content.app.disk.controller;
+package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.model.dto.*;
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
-import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
-import cn.reghao.tnb.content.app.disk.model.vo.*;
-import cn.reghao.tnb.content.app.disk.service.DiskFileService;
+import cn.reghao.tnb.file.app.zdisk.model.dto.*;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.query.DiskQuery;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskFileDetail;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskInfo;
+import cn.reghao.tnb.file.app.zdisk.model.vo.FileInfo;
+import cn.reghao.tnb.file.app.zdisk.model.vo.NamePath;
+import cn.reghao.tnb.file.app.zdisk.service.DiskFileService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/DiskFolderController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskFolderController.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.content.app.disk.controller;
+package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.content.app.disk.model.dto.CreateFolder;
-import cn.reghao.tnb.content.app.disk.model.dto.RenameFile;
-import cn.reghao.tnb.content.app.disk.model.vo.FolderTree;
-import cn.reghao.tnb.content.app.disk.service.DiskFolderService;
+import cn.reghao.tnb.file.app.zdisk.model.dto.CreateFolder;
+import cn.reghao.tnb.file.app.zdisk.model.dto.RenameFile;
+import cn.reghao.tnb.file.app.zdisk.model.vo.FolderTree;
+import cn.reghao.tnb.file.app.zdisk.service.DiskFolderService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/DiskShareController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskShareController.java

@@ -1,13 +1,13 @@
-package cn.reghao.tnb.content.app.disk.controller;
+package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.account.api.dto.AccountAvatar;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.content.app.disk.model.dto.ShareCreate;
-import cn.reghao.tnb.content.app.disk.model.vo.DiskShareInfo;
-import cn.reghao.tnb.content.app.disk.service.DiskShareService;
+import cn.reghao.tnb.file.app.zdisk.model.dto.ShareCreate;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskShareInfo;
+import cn.reghao.tnb.file.app.zdisk.service.DiskShareService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/DiskSyncController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskSyncController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.disk.controller;
+package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.content.app.disk.model.dto.SyncedFile;
-import cn.reghao.tnb.content.app.disk.service.DiskSyncService;
+import cn.reghao.tnb.file.app.zdisk.model.dto.SyncedFile;
+import cn.reghao.tnb.file.app.zdisk.service.DiskSyncService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/mapper/CamDeviceMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/mapper/CamDeviceMapper.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.disk.db.mapper;
+package cn.reghao.tnb.file.app.zdisk.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
-import cn.reghao.tnb.content.app.disk.model.query.CamDeviceQuery;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
+import cn.reghao.tnb.file.app.zdisk.model.query.CamDeviceQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/mapper/CamRecordMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/mapper/CamRecordMapper.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.disk.db.mapper;
+package cn.reghao.tnb.file.app.zdisk.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.tnb.content.app.disk.model.po.CamRecord;
-import cn.reghao.tnb.content.app.disk.model.vo.CamRecordInfo;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamRecord;
+import cn.reghao.tnb.file.app.zdisk.model.vo.CamRecordInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/mapper/DiskAlbumMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/mapper/DiskAlbumMapper.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.disk.db.mapper;
+package cn.reghao.tnb.file.app.zdisk.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.tnb.content.app.disk.model.po.DiskAlbum;
-import cn.reghao.tnb.content.app.disk.model.po.DiskAlbumFile;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbumFile;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/mapper/DiskFileMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/mapper/DiskFileMapper.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.content.app.disk.db.mapper;
+package cn.reghao.tnb.file.app.zdisk.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
-import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
-import cn.reghao.tnb.content.app.disk.model.vo.DiskFileCount;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.query.DiskQuery;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskFileCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/mapper/DiskShareMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/mapper/DiskShareMapper.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.disk.db.mapper;
+package cn.reghao.tnb.file.app.zdisk.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.tnb.content.app.disk.model.po.DiskShare;
-import cn.reghao.tnb.content.app.disk.model.po.DiskShareTo;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskShare;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskShareTo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/mapper/UserActivityMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/mapper/UserActivityMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.disk.db.mapper;
+package cn.reghao.tnb.file.app.zdisk.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.disk.model.po.UserActivity;
+import cn.reghao.tnb.file.app.zdisk.model.po.UserActivity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/repository/DiskAlbumRepository.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/repository/DiskAlbumRepository.java

@@ -1,8 +1,7 @@
-package cn.reghao.tnb.content.app.disk.db.repository;
+package cn.reghao.tnb.file.app.zdisk.db.repository;
 
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskAlbumMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
-import cn.reghao.tnb.content.app.disk.model.po.DiskAlbumFile;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskAlbumMapper;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbumFile;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/repository/DiskCamRepository.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/repository/DiskCamRepository.java

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.content.app.disk.db.repository;
+package cn.reghao.tnb.file.app.zdisk.db.repository;
 
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.db.mapper.CamDeviceMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.CamRecordMapper;
-import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
-import cn.reghao.tnb.content.app.disk.model.query.CamDeviceQuery;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.CamDeviceMapper;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.CamRecordMapper;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
+import cn.reghao.tnb.file.app.zdisk.model.query.CamDeviceQuery;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/db/repository/DiskShareRepository.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/repository/DiskShareRepository.java

@@ -1,8 +1,7 @@
-package cn.reghao.tnb.content.app.disk.db.repository;
+package cn.reghao.tnb.file.app.zdisk.db.repository;
 
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskAlbumMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskShareMapper;
-import cn.reghao.tnb.content.app.util.IdService;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskShareMapper;
+import cn.reghao.tnb.file.app.util.IdService;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/constant/AlbumType.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/constant/AlbumType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.constant;
+package cn.reghao.tnb.file.app.zdisk.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/AlbumCreate.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/AlbumCreate.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 import org.hibernate.validator.constraints.Length;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/AlbumEdit.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/AlbumEdit.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/CamDeviceDto.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CamDeviceDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/CamRecordDto.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CamRecordDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/CreateDir.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CreateDir.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/DeleteFile.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/DeleteFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/MoveFile.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/MoveFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/RenameFile.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/RenameFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/SearchForm.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/SearchForm.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/ShareCreate.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/ShareCreate.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import cn.reghao.jutil.web.validator.ValidEnum;
-import cn.reghao.tnb.content.app.disk.model.constant.AlbumType;
+import cn.reghao.tnb.file.app.zdisk.model.constant.AlbumType;
 import lombok.Getter;
 
 import javax.validation.constraints.NotNull;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/SyncedFile.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/SyncedFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/dto/UploadedFile.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/UploadedFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.dto;
+package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/CamDevice.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/po/CamDevice.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.po;
+package cn.reghao.tnb.file.app.zdisk.model.po;
 
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.jutil.jdk.db.BaseObject;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/CamRecord.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/po/CamRecord.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.po;
+package cn.reghao.tnb.file.app.zdisk.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/DiskAlbum.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/po/DiskAlbum.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.disk.model.po;
+package cn.reghao.tnb.file.app.zdisk.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.model.dto.AlbumCreate;
+import cn.reghao.tnb.file.app.zdisk.model.dto.AlbumCreate;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/DiskAlbumFile.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/po/DiskAlbumFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.po;
+package cn.reghao.tnb.file.app.zdisk.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.AllArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/DiskFile.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/po/DiskFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.po;
+package cn.reghao.tnb.file.app.zdisk.model.po;
 
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.jutil.jdk.db.BaseObject;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/DiskShare.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/po/DiskShare.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.disk.model.po;
+package cn.reghao.tnb.file.app.zdisk.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.model.dto.ShareCreate;
+import cn.reghao.tnb.file.app.zdisk.model.dto.ShareCreate;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/DiskShareTo.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/po/DiskShareTo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.po;
+package cn.reghao.tnb.file.app.zdisk.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.AllArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/UserActivity.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/po/UserActivity.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.po;
+package cn.reghao.tnb.file.app.zdisk.model.po;
 
 import cn.reghao.tnb.common.auth.UserContext;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/query/CamDeviceQuery.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/query/CamDeviceQuery.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.query;
+package cn.reghao.tnb.file.app.zdisk.model.query;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/query/DiskQuery.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/query/DiskQuery.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.query;
+package cn.reghao.tnb.file.app.zdisk.model.query;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/CamDetail.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/CamDetail.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
-import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
 import lombok.Getter;
 import lombok.Setter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/CamRecordDetail.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/CamRecordDetail.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.tnb.content.app.disk.model.po.CamRecord;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamRecord;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/CamRecordInfo.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/CamRecordInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/CamSearch.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/CamSearch.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskAlbumDetail.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/DiskAlbumDetail.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.tnb.content.app.disk.model.po.DiskAlbum;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum;
 
 /**
  * @author reghao

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskAlbumInfo.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/DiskAlbumInfo.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
-import cn.reghao.tnb.content.app.disk.model.po.DiskAlbum;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum;
 
 /**
  * @author reghao

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskFileCount.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/DiskFileCount.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskFileDetail.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/DiskFileDetail.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import cn.reghao.tnb.oss.api.dto.ObjectInfo;
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

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

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import cn.reghao.jutil.jdk.db.PageList;
 import lombok.AllArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskShareInfo.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/DiskShareInfo.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.tnb.content.app.disk.model.constant.AlbumType;
-import cn.reghao.tnb.content.app.disk.model.po.DiskShare;
+import cn.reghao.tnb.file.app.zdisk.model.constant.AlbumType;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskShare;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/FileInfo.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/FileInfo.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.tnb.oss.api.constant.ObjectType;
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/FileTree.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/FileTree.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
 import lombok.Getter;
 
 import java.util.ArrayList;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/FolderTree.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/FolderTree.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
 import lombok.Getter;
 import lombok.Setter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/NamePath.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/vo/NamePath.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.model.vo;
+package cn.reghao.tnb.file.app.zdisk.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/CamRecordService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/CamRecordService.java

@@ -1,21 +1,22 @@
-package cn.reghao.tnb.content.app.disk.service;
+package cn.reghao.tnb.file.app.zdisk.service;
 
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.CamDeviceMapper;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.CamRecordMapper;
+import cn.reghao.tnb.file.app.zdisk.model.constant.AlbumType;
+import cn.reghao.tnb.file.app.zdisk.model.query.CamDeviceQuery;
+import cn.reghao.tnb.file.app.zdisk.model.vo.CamRecordDetail;
+import cn.reghao.tnb.file.app.zdisk.model.vo.CamRecordInfo;
 import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.db.mapper.CamDeviceMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.CamRecordMapper;
-import cn.reghao.tnb.content.app.disk.model.constant.AlbumType;
-import cn.reghao.tnb.content.app.disk.model.dto.CamRecordDto;
-import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
-import cn.reghao.tnb.content.app.disk.model.po.CamRecord;
-import cn.reghao.tnb.content.app.disk.model.query.CamDeviceQuery;
-import cn.reghao.tnb.content.app.disk.model.vo.*;
-import cn.reghao.tnb.content.app.util.IdService;
+import cn.reghao.tnb.file.app.zdisk.model.dto.CamRecordDto;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamRecord;
+import cn.reghao.tnb.file.app.util.IdService;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/CamService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/CamService.java

@@ -1,20 +1,20 @@
-package cn.reghao.tnb.content.app.disk.service;
+package cn.reghao.tnb.file.app.zdisk.service;
 
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.tnb.account.api.dto.AccountAvatar;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.ConstantId;
-import cn.reghao.tnb.content.app.disk.db.mapper.CamDeviceMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.UserActivityMapper;
-import cn.reghao.tnb.content.app.disk.model.constant.AlbumType;
-import cn.reghao.tnb.content.app.disk.model.dto.CamDeviceDto;
-import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
-import cn.reghao.tnb.content.app.disk.model.po.UserActivity;
-import cn.reghao.tnb.content.app.disk.model.query.CamDeviceQuery;
+import cn.reghao.tnb.file.app.util.IdService;
+import cn.reghao.tnb.file.app.util.RandomUtil;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.CamDeviceMapper;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.UserActivityMapper;
+import cn.reghao.tnb.file.app.zdisk.model.constant.AlbumType;
+import cn.reghao.tnb.file.app.zdisk.model.dto.CamDeviceDto;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
+import cn.reghao.tnb.file.app.zdisk.model.po.UserActivity;
+import cn.reghao.tnb.file.app.zdisk.model.query.CamDeviceQuery;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.content.app.util.IdService;
-import cn.reghao.tnb.content.app.util.RandomUtil;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskAlbumService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/DiskAlbumService.java

@@ -1,24 +1,27 @@
-package cn.reghao.tnb.content.app.disk.service;
+package cn.reghao.tnb.file.app.zdisk.service;
 
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.tnb.file.app.zdisk.model.constant.AlbumType;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskAlbumDetail;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskAlbumInfo;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskFileDetail;
 import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.account.api.dto.AccountAvatar;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskAlbumMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
-import cn.reghao.tnb.content.app.disk.db.repository.DiskAlbumRepository;
-import cn.reghao.tnb.content.app.disk.model.constant.AlbumType;
-import cn.reghao.tnb.content.app.disk.model.dto.AlbumCreate;
-import cn.reghao.tnb.content.app.disk.model.po.DiskAlbum;
-import cn.reghao.tnb.content.app.disk.model.po.DiskAlbumFile;
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
-import cn.reghao.tnb.content.app.disk.model.vo.*;
-import cn.reghao.tnb.content.app.util.IdService;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskAlbumMapper;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskFileMapper;
+import cn.reghao.tnb.file.app.zdisk.db.repository.DiskAlbumRepository;
+import cn.reghao.tnb.file.app.zdisk.model.dto.AlbumCreate;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbumFile;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.vo.*;
+import cn.reghao.tnb.file.app.util.IdService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskFileService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/DiskFileService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.service;
+package cn.reghao.tnb.file.app.zdisk.service;
 
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.converter.ByteConverter;
@@ -7,18 +7,22 @@ import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskFileCount;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskFileDetail;
+import cn.reghao.tnb.file.app.zdisk.model.vo.FileInfo;
+import cn.reghao.tnb.file.app.zdisk.model.vo.NamePath;
 import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.StringUtil;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
-import cn.reghao.tnb.content.app.disk.model.dto.DeleteFile;
-import cn.reghao.tnb.content.app.disk.model.dto.UploadedFile;
-import cn.reghao.tnb.content.app.disk.model.dto.MoveFile;
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
-import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
-import cn.reghao.tnb.content.app.disk.model.vo.*;
-import cn.reghao.tnb.content.app.disk.util.FileUtil;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskFileMapper;
+import cn.reghao.tnb.file.app.zdisk.model.dto.DeleteFile;
+import cn.reghao.tnb.file.app.zdisk.model.dto.UploadedFile;
+import cn.reghao.tnb.file.app.zdisk.model.dto.MoveFile;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.query.DiskQuery;
+import cn.reghao.tnb.file.app.zdisk.model.vo.*;
+import cn.reghao.tnb.file.app.zdisk.util.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;

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

@@ -1,15 +1,15 @@
-package cn.reghao.tnb.content.app.disk.service;
+package cn.reghao.tnb.file.app.zdisk.service;
 
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
-import cn.reghao.tnb.content.app.disk.model.dto.CreateFolder;
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
-import cn.reghao.tnb.content.app.disk.model.query.DiskQuery;
-import cn.reghao.tnb.content.app.disk.model.vo.FolderTree;
-import cn.reghao.tnb.content.app.disk.util.FileUtil;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskFileMapper;
+import cn.reghao.tnb.file.app.zdisk.model.dto.CreateFolder;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.query.DiskQuery;
+import cn.reghao.tnb.file.app.zdisk.model.vo.FolderTree;
+import cn.reghao.tnb.file.app.zdisk.util.FileUtil;
 import org.springframework.stereotype.Service;
 
 import java.io.File;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskShareService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/DiskShareService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.service;
+package cn.reghao.tnb.file.app.zdisk.service;
 
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
@@ -6,18 +6,18 @@ import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.tnb.account.api.dto.AccountAvatar;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskAlbumMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskShareMapper;
-import cn.reghao.tnb.content.app.disk.db.repository.DiskCamRepository;
-import cn.reghao.tnb.content.app.disk.db.repository.DiskShareRepository;
-import cn.reghao.tnb.content.app.disk.model.constant.AlbumType;
-import cn.reghao.tnb.content.app.disk.model.dto.ShareCreate;
-import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
-import cn.reghao.tnb.content.app.disk.model.po.DiskAlbum;
-import cn.reghao.tnb.content.app.disk.model.po.DiskShare;
-import cn.reghao.tnb.content.app.disk.model.po.DiskShareTo;
-import cn.reghao.tnb.content.app.disk.model.vo.DiskShareInfo;
-import cn.reghao.tnb.content.app.util.IdService;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskAlbumMapper;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskShareMapper;
+import cn.reghao.tnb.file.app.zdisk.db.repository.DiskCamRepository;
+import cn.reghao.tnb.file.app.zdisk.db.repository.DiskShareRepository;
+import cn.reghao.tnb.file.app.zdisk.model.constant.AlbumType;
+import cn.reghao.tnb.file.app.zdisk.model.dto.ShareCreate;
+import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskShare;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskShareTo;
+import cn.reghao.tnb.file.app.zdisk.model.vo.DiskShareInfo;
+import cn.reghao.tnb.file.app.util.IdService;
 import cn.reghao.tnb.user.api.iface.UserService;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskSyncService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/DiskSyncService.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.disk.service;
+package cn.reghao.tnb.file.app.zdisk.service;
 
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.disk.model.dto.SyncedFile;
-import cn.reghao.tnb.content.app.disk.model.dto.UploadedFile;
-import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
+import cn.reghao.tnb.file.app.zdisk.model.dto.SyncedFile;
+import cn.reghao.tnb.file.app.zdisk.model.dto.UploadedFile;
+import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/util/FileUtil.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/util/FileUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.disk.util;
+package cn.reghao.tnb.file.app.zdisk.util;
 
 import java.io.File;
 import java.util.UUID;

content/content-service/src/main/resources/mapper/disk/CamDeviceMapper.xml → file/file-service/src/main/resources/mapper/disk/CamDeviceMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.disk.db.mapper.CamDeviceMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zdisk.db.mapper.CamDeviceMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into disk_cam_device
         (`cam_id`,`cam_name`,`state`,`add_at`,`add_by`,`pull_url`,`push_url`)
@@ -25,7 +25,7 @@
             </if>
         </where>
     </select>
-    <select id="findCamDeviceQueryByPage" resultType="cn.reghao.tnb.content.app.disk.model.po.CamDevice">
+    <select id="findCamDeviceQueryByPage" resultType="cn.reghao.tnb.file.app.zdisk.model.po.CamDevice">
         select *
         from disk_cam_device
         <where>
@@ -41,7 +41,7 @@
             </if>
         </where>
     </select>
-    <select id="findByCamIds" resultType="cn.reghao.tnb.content.app.disk.model.po.CamDevice">
+    <select id="findByCamIds" resultType="cn.reghao.tnb.file.app.zdisk.model.po.CamDevice">
         select *
         from disk_cam_device
         where deleted=0 and cam_id in

content/content-service/src/main/resources/mapper/disk/CamRecordMapper.xml → file/file-service/src/main/resources/mapper/disk/CamRecordMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.disk.db.mapper.CamRecordMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zdisk.db.mapper.CamRecordMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into disk_cam_record
         (`cam_id`,`record_id`,`video_file_id`,`start_at`,`duration`)
@@ -14,18 +14,18 @@
         where album_id=#{albumId} and post_id=#{postId}
     </delete>
     
-    <select id="findByCamId" resultType="cn.reghao.tnb.content.app.disk.model.po.CamRecord">
+    <select id="findByCamId" resultType="cn.reghao.tnb.file.app.zdisk.model.po.CamRecord">
         select *
         from disk_cam_record
         where cam_id=#{camId}
     </select>
-    <select id="findByCamIdAndStartAt" resultType="cn.reghao.tnb.content.app.disk.model.vo.CamRecordInfo">
+    <select id="findByCamIdAndStartAt" resultType="cn.reghao.tnb.file.app.zdisk.model.vo.CamRecordInfo">
         select cam_id,record_id,DATE_FORMAT(start_at,'%T') as startTime,duration
         from disk_cam_record
         where cam_id=#{camId} and DATE_FORMAT(start_at,'%Y-%m-%d')=#{dayStr}
         order by start_at asc
     </select>
-    <select id="findByRecordId" resultType="cn.reghao.tnb.content.app.disk.model.po.CamRecord">
+    <select id="findByRecordId" resultType="cn.reghao.tnb.file.app.zdisk.model.po.CamRecord">
         select *
         from disk_cam_record
         where record_id=#{recordId}

content/content-service/src/main/resources/mapper/disk/DiskAlbumMapper.xml → file/file-service/src/main/resources/mapper/disk/DiskAlbumMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.disk.db.mapper.DiskAlbumMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zdisk.db.mapper.DiskAlbumMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into disk_album
         (`album_id`,`album_name`,`file_type`,`cover_file_id`,`num`,`create_at`,`create_by`)
@@ -46,23 +46,23 @@
         </foreach>
     </delete>
     
-    <select id="findDiskAlbum" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskAlbum">
+    <select id="findDiskAlbum" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum">
         select *
         from disk_album
         where album_id=#{albumId}
     </select>
-    <select id="findByCreateBy" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskAlbum">
+    <select id="findByCreateBy" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum">
         select *
         from disk_album
         where create_by=#{createBy}
     </select>
-    <select id="findDiskAlbumFiles" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskAlbumFile">
+    <select id="findDiskAlbumFiles" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbumFile">
         select *
         from disk_album_file
         where album_id=#{albumId}
         order by pos asc
     </select>
-    <select id="findDiskAlbumFileList" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskAlbumFile">
+    <select id="findDiskAlbumFileList" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbumFile">
         select *
         from disk_album_file
         where album_id=#{albumId} and sha256sum in
@@ -76,7 +76,7 @@
         from disk_album_file
         where album_id=#{albumId}
     </select>
-    <select id="findDiskAlbumFileByPage" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskAlbumFile">
+    <select id="findDiskAlbumFileByPage" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbumFile">
         select *
         from disk_album_file
         where album_id=#{albumId}

content/content-service/src/main/resources/mapper/disk/DiskFileMapper.xml → file/file-service/src/main/resources/mapper/disk/DiskFileMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zdisk.db.mapper.DiskFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into disk_file
         (`channel_code`,`file_id`,`pid`,`path`,`filename`,`file_type`,`sha256sum`,`size`,`owner`)
@@ -66,7 +66,7 @@
             </if>
         </where>
     </select>
-    <select id="findDiskQueryByPage" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
+    <select id="findDiskQueryByPage" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskFile">
         select *
         from disk_file
         <where>
@@ -95,14 +95,14 @@
         </where>
         order by file_type,filename
     </select>
-    <select id="findFileTypeCountByGroup" resultType="cn.reghao.tnb.content.app.disk.model.vo.DiskFileCount">
+    <select id="findFileTypeCountByGroup" resultType="cn.reghao.tnb.file.app.zdisk.model.vo.DiskFileCount">
         select file,count(*) as total
         from disk_file
         group by file_type
         order by total desc
     </select>
 
-    <select id="findByFileIds" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
+    <select id="findByFileIds" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskFile">
         select *
         from disk_file
         where deleted=0 and file_id in
@@ -110,7 +110,7 @@
             #{id}
         </foreach>
     </select>
-    <select id="findByParentIds" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
+    <select id="findByParentIds" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskFile">
         select *
         from disk_file
         where deleted=0 and pid in
@@ -118,12 +118,12 @@
             #{id}
         </foreach>
     </select>
-    <select id="findRoot" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
+    <select id="findRoot" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskFile">
         select *
         from disk_file
         where file_id='0'
     </select>
-    <select id="findByPathPrefix" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
+    <select id="findByPathPrefix" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskFile">
         select *
         from disk_file
         where deleted=0 and file_id!=#{fileId} and `path` like concat(#{pathPrefix})
@@ -143,7 +143,7 @@
         )
         group by sha256sum
     </select>
-    <select id="findSha256sumGroupByPage" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
+    <select id="findSha256sumGroupByPage" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskFile">
         select *
         from disk_file
         where deleted=0 and `owner`=#{userId} and file_type=#{fileType} and sha256sum not in (
@@ -157,7 +157,7 @@
         )
         group by sha256sum
     </select>
-    <select id="findSha256sumGroup" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskFile">
+    <select id="findSha256sumGroup" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskFile">
         select *
         from disk_file
         where deleted=0 and sha256sum in

content/content-service/src/main/resources/mapper/disk/DiskShareMapper.xml → file/file-service/src/main/resources/mapper/disk/DiskShareMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.disk.db.mapper.DiskShareMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zdisk.db.mapper.DiskShareMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into disk_share
         (`share_id`,`album_type`,`album_id`,`create_at`,`create_by`)
@@ -32,18 +32,18 @@
         from disk_share
         where deleted=0 and create_by=#{createBy}
     </select>
-    <select id="findDiskShareByPage" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskShare">
+    <select id="findDiskShareByPage" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskShare">
         select *
         from disk_share
         where deleted=0 and create_by=#{createBy}
     </select>
-    <select id="findDiskShare" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskShare">
+    <select id="findDiskShare" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskShare">
         select *
         from disk_share
         where deleted=0 and share_id=#{shareId}
     </select>
 
-    <select id="findDiskShareList" resultType="cn.reghao.tnb.content.app.disk.model.po.DiskShare">
+    <select id="findDiskShareList" resultType="cn.reghao.tnb.file.app.zdisk.model.po.DiskShare">
         select disk_share.*
         from disk_share_to
         inner join disk_share

content/content-service/src/main/resources/mapper/disk/UserActivityMapper.xml → file/file-service/src/main/resources/mapper/disk/UserActivityMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.content.app.disk.db.mapper.UserActivityMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zdisk.db.mapper.UserActivityMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into disk_user_activity
         (`id`,`activity`,`create_time`,`create_by`)

content/content-service/src/test/java/cn/reghao/tnb/content/app/disk/service/DiskTest.java → file/file-service/src/test/java/DiskTest.java

@@ -1,11 +1,10 @@
-package cn.reghao.tnb.content.app.disk.service;
-
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.ContentApplication;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskAlbumMapper;
-import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
-import cn.reghao.tnb.content.app.disk.model.vo.FolderTree;
+import cn.reghao.tnb.file.app.FileApplication;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskAlbumMapper;
+import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskFileMapper;
+import cn.reghao.tnb.file.app.zdisk.model.vo.FolderTree;
+import cn.reghao.tnb.file.app.zdisk.service.DiskFolderService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +20,7 @@ import java.util.List;
  */
 @Slf4j
 @ActiveProfiles("dev")
-@SpringBootTest(classes = ContentApplication.class)
+@SpringBootTest(classes = FileApplication.class)
 public class DiskTest {
     @Autowired
     DiskAlbumMapper diskAlbumMapper;

content/content-service/src/test/java/cn/reghao/tnb/content/app/disk/service/DiskUnitTest.java → file/file-service/src/test/java/DiskUnitTest.java

@@ -1,9 +1,5 @@
-package cn.reghao.tnb.content.app.disk.service;
-
+import cn.reghao.tnb.file.app.zdisk.model.vo.FileTree;
 import cn.reghao.tnb.oss.api.constant.ObjectType;
-import cn.reghao.tnb.content.app.disk.model.vo.FileTree;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.File;
@@ -16,7 +12,6 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-@RunWith(MockitoJUnitRunner.class)
 public class DiskUnitTest {
     void walkDir(Path path) throws IOException {
         Files.walkFileTree(path, new FileVisitor<Path>() {
@@ -81,7 +76,6 @@ public class DiskUnitTest {
 
     }
 
-    @Test
     public void treeTest() throws Exception {
         /*Map<String, List<FileTree>> pidTreeMap = getTreeMap();
         pidTreeMap.forEach((key, list) -> {