update

oss-api/src/main/java/cn/reghao/oss/api/iface/ConsoleService.java

@@ -7,7 +7,7 @@ import cn.reghao.oss.api.dto.StoreNodeDto;
 
 /**
  * 获取 StoreNode 配置
- * oss-store 调用
+ * 由 oss-console 实现, oss-store 调用
  * @author reghao
  * @date 2024-07-02 10:55:56
  */

oss-api/src/main/java/cn/reghao/oss/api/iface/DiskService.java

@@ -1,14 +0,0 @@
-package cn.reghao.oss.api.iface;
-
-import cn.reghao.oss.api.dto.FileInfo;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2024-07-11 16:45:54
- */
-public interface DiskService {
-    List<FileInfo> getFiles(String pid, int pageSize, String nextObjectId);
-}

oss-api/src/main/java/cn/reghao/oss/api/iface/FileService.java

@@ -1,9 +0,0 @@
-package cn.reghao.oss.api.iface;
-
-/**
- * @author reghao
- * @date 2024-07-07 16:55:29
- */
-public interface FileService {
-    String getAccountAvatar(long userId);
-}

oss-api/src/main/java/cn/reghao/oss/api/iface/ObjectChannelService.java

@@ -1,18 +0,0 @@
-package cn.reghao.oss.api.iface;
-
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.api.dto.*;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2024-07-12 22:16:31
- */
-public interface ObjectChannelService {
-    Result addObjectChannel(UploadChannelDto uploadChannelDto);
-    void updateScope(ChannelScopeDto channelScopeDto);
-    List<UploadChannelVo> getObjectChannels(int createBy);
-    ObjectChannel getObjectChannel(int id);
-    List<UserNodeVO> getUserStoreNodes(int createBy);
-}

oss-api/src/main/java/cn/reghao/oss/api/iface/StoreService.java

@@ -1,5 +1,6 @@
 package cn.reghao.oss.api.iface;
 
+import cn.reghao.oss.api.dto.FileInfo;
 import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.oss.api.dto.StoreInfo;
 import cn.reghao.oss.api.dto.media.AudioInfo;
@@ -7,9 +8,11 @@ import cn.reghao.oss.api.dto.media.ConvertedImageInfo;
 import cn.reghao.oss.api.dto.media.ImageInfo;
 import cn.reghao.oss.api.dto.media.VideoInfo;
 
+import java.util.List;
+
 /**
  * 对 oss-store 进行操作
- * oss-console 调用
+ * 由 oss-store 实现, oss-console 调用
  *
  * @author reghao
  * @date 2023-08-01 14:51:50
@@ -29,4 +32,6 @@ public interface StoreService {
     ImageInfo getImageInfo(String objectId);
     ConvertedImageInfo getWebpInfo(String objectId);
     AudioInfo getAudioInfo(String objectId);
+
+    List<FileInfo> getFiles(String pid, int pageSize, String nextObjectId);
 }

oss-store/src/main/java/cn/reghao/oss/store/db/repository/ObjectRepository.java

@@ -1,5 +1,6 @@
 package cn.reghao.oss.store.db.repository;
 
+import cn.reghao.oss.api.dto.FileInfo;
 import cn.reghao.oss.store.db.mapper.DataBlockMapper;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import cn.reghao.oss.store.model.po.DataBlock;
@@ -13,7 +14,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author reghao
@@ -89,4 +92,36 @@ public class ObjectRepository {
     public ObjectMeta getObjectMetaById(String objectId) {
         return fileMetaMapper.findObjectMetaById(objectId);
     }
+
+    public List<FileInfo> getFiles(String pid, int pageSize, String nextObjectId) {
+        return fileMetaMapper.findByPid(pid, pageSize, nextObjectId);
+    }
+
+    public List<FileInfo> getFiles(int pageNumber, int pageSize) {
+        String bucket = "";
+        String prefix = "image/i/";
+        String startAfter = "image/cover/";
+        startAfter = "";
+        Integer maxKeys = 10;
+
+        StringBuilder regex = new StringBuilder();
+        //regex.append("^").append(prefix).append("([^/])+/?$");
+        regex.append(prefix);
+        List<FileMeta> list;
+        if (startAfter.isBlank()) {
+            list = fileMetaMapper.findAll0(bucket, maxKeys, regex.toString());
+        } else {
+            list = fileMetaMapper.findAll2(bucket, prefix, startAfter, maxKeys);
+        }
+
+        return list.stream().map(fileMeta -> {
+            String objectId = fileMeta.getObjectId();
+            String objectName = fileMeta.getObjectName();
+            int fileType = fileMeta.getFileType();
+            String filename = fileMeta.getFilename();
+            long size = fileMeta.getSize();
+            LocalDateTime updateTime = fileMeta.getUpdateTime();
+            return new FileInfo();
+        }).collect(Collectors.toList());
+    }
 }

oss-store/src/main/java/cn/reghao/oss/store/rpc/DiskServiceImpl.java

@@ -1,59 +0,0 @@
-package cn.reghao.oss.store.rpc;
-
-import cn.reghao.oss.api.dto.FileInfo;
-import cn.reghao.oss.api.iface.DiskService;
-import cn.reghao.oss.store.db.mapper.FileMetaMapper;
-import cn.reghao.oss.store.model.po.FileMeta;
-import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author reghao
- * @date 2024-07-11 16:46:50
- */
-@DubboService
-@Service
-public class DiskServiceImpl implements DiskService {
-    private final FileMetaMapper fileMetaMapper;
-
-    public DiskServiceImpl(FileMetaMapper fileMetaMapper) {
-        this.fileMetaMapper = fileMetaMapper;
-    }
-
-    public List<FileInfo> getFiles(String pid, int pageSize, String nextObjectId) {
-        return fileMetaMapper.findByPid(pid, pageSize, nextObjectId);
-    }
-
-    public List<FileInfo> getFiles(int pageNumber, int pageSize) {
-        String bucket = "";
-        String prefix = "image/i/";
-        String startAfter = "image/cover/";
-        startAfter = "";
-        Integer maxKeys = 10;
-
-        StringBuilder regex = new StringBuilder();
-        //regex.append("^").append(prefix).append("([^/])+/?$");
-        regex.append(prefix);
-        List<FileMeta> list;
-        if (startAfter.isBlank()) {
-            list = fileMetaMapper.findAll0(bucket, maxKeys, regex.toString());
-        } else {
-            list = fileMetaMapper.findAll2(bucket, prefix, startAfter, maxKeys);
-        }
-
-        return list.stream().map(fileMeta -> {
-            String objectId = fileMeta.getObjectId();
-            String objectName = fileMeta.getObjectName();
-            int fileType = fileMeta.getFileType();
-            String filename = fileMeta.getFilename();
-            long size = fileMeta.getSize();
-            LocalDateTime updateTime = fileMeta.getUpdateTime();
-            return new FileInfo();
-        }).collect(Collectors.toList());
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/rpc/StoreServiceImpl.java

@@ -164,4 +164,9 @@ public class StoreServiceImpl implements StoreService {
 
         return null;
     }
+
+    @Override
+    public List<FileInfo> getFiles(String pid, int pageSize, String nextObjectId) {
+        return objectRepository.getFiles(pid, pageSize, nextObjectId);
+    }
 }