Browse Source

store-api 中引入 file-api, store-api 中原有的部分接口和 DTO 放到 file-api 中

reghao 1 năm trước cách đây
mục cha
commit
709e2ddaa7
44 tập tin đã thay đổi với 124 bổ sung472 xóa
  1. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/controller/MediaController.java
  2. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/controller/ObjectController.java
  3. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/controller/OssServerController.java
  4. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/controller/OssStoreController.java
  5. 2 2
      oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UploadChannelPageController.java
  6. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/model/vo/StoreNodeVO.java
  7. 2 2
      oss-console/src/main/java/cn/reghao/oss/console/app/model/vo/UploadChannelVo.java
  8. 2 2
      oss-console/src/main/java/cn/reghao/oss/console/app/rpc/MediaRpcService.java
  9. 2 2
      oss-console/src/main/java/cn/reghao/oss/console/app/rpc/OssObjectService.java
  10. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/service/OssStoreService.java
  11. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/service/UploadChannelService.java
  12. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/service/UserKeyService.java
  13. 1 1
      oss-console/src/test/java/OssConsoleTest.java
  14. 3 3
      oss-sdk/src/main/java/cn/reghao/oss/sdk/OssConsoleClient.java
  15. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/config/SpringLifecycle.java
  16. 3 3
      oss-store/src/main/java/cn/reghao/oss/store/controller/ObjectGetController.java
  17. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/controller/ObjectUploadController.java
  18. 45 4
      oss-store/src/main/java/cn/reghao/oss/store/rpc/MediaServiceImpl.java
  19. 28 16
      oss-store/src/main/java/cn/reghao/oss/store/rpc/ObjectServiceImpl.java
  20. 7 3
      oss-store/src/main/java/cn/reghao/oss/store/rpc/StoreServiceImpl.java
  21. 2 2
      oss-store/src/main/java/cn/reghao/oss/store/service/ChannelValidateService.java
  22. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/service/ObjectMultipartUploadService.java
  23. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/service/ObjectNameService.java
  24. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/service/SignService.java
  25. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/service/StoreLocalService.java
  26. 4 4
      oss-store/src/main/java/cn/reghao/oss/store/task/MediaFileProcessor.java
  27. 2 2
      oss-store/src/main/java/cn/reghao/oss/store/util/FileType.java
  28. 5 0
      store-api/pom.xml
  29. 0 55
      store-api/src/main/java/cn/reghao/oss/storeapi/constant/ChannelAction.java
  30. 0 56
      store-api/src/main/java/cn/reghao/oss/storeapi/constant/ObjectScope.java
  31. 0 65
      store-api/src/main/java/cn/reghao/oss/storeapi/constant/ObjectType.java
  32. 0 15
      store-api/src/main/java/cn/reghao/oss/storeapi/constant/SupportedMedia.java
  33. 0 11
      store-api/src/main/java/cn/reghao/oss/storeapi/constant/VideoUrlType.java
  34. 0 19
      store-api/src/main/java/cn/reghao/oss/storeapi/dto/DownloadUrl.java
  35. 0 26
      store-api/src/main/java/cn/reghao/oss/storeapi/dto/ObjectChannel.java
  36. 0 31
      store-api/src/main/java/cn/reghao/oss/storeapi/dto/ObjectInfo.java
  37. 1 0
      store-api/src/main/java/cn/reghao/oss/storeapi/dto/StoreInfo.java
  38. 0 24
      store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/AudioInfo.java
  39. 0 21
      store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/ConvertedImageInfo.java
  40. 0 24
      store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/ImageInfo.java
  41. 0 32
      store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/VideoInfo.java
  42. 0 15
      store-api/src/main/java/cn/reghao/oss/storeapi/iface/MediaService.java
  43. 0 17
      store-api/src/main/java/cn/reghao/oss/storeapi/iface/ObjectService.java
  44. 1 1
      store-api/src/main/java/cn/reghao/oss/storeapi/iface/StoreService.java

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/controller/MediaController.java

@@ -3,7 +3,7 @@ package cn.reghao.oss.console.app.controller;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.console.app.model.dto.GetImageUrls;
 import cn.reghao.oss.console.app.rpc.MediaRpcService;
-import cn.reghao.oss.storeapi.dto.media.*;
+import cn.reghao.tnb.file.api.dto.media.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/controller/ObjectController.java

@@ -3,7 +3,7 @@ package cn.reghao.oss.console.app.controller;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.console.app.model.dto.ObjectsScopeDto;
 import cn.reghao.oss.console.app.rpc.OssObjectService;
-import cn.reghao.oss.storeapi.dto.ObjectInfo;
+import cn.reghao.tnb.file.api.dto.ObjectInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/controller/OssServerController.java

@@ -3,7 +3,7 @@ package cn.reghao.oss.console.app.controller;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.console.app.service.UploadChannelService;
 import cn.reghao.oss.console.util.AuthKeyContext;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.ServerInfo;
 import cn.reghao.oss.console.app.rpc.OssService;
 import io.swagger.annotations.Api;

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/controller/OssStoreController.java

@@ -2,7 +2,7 @@ package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.console.app.service.OssStoreService;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.StoreNodeDto;
 import cn.reghao.oss.storeapi.dto.StoreProperties;
 import io.swagger.annotations.Api;

+ 2 - 2
oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UploadChannelPageController.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.controller.page;
 
-import cn.reghao.oss.storeapi.constant.ObjectScope;
-import cn.reghao.oss.storeapi.constant.ObjectType;
+import cn.reghao.tnb.file.api.constant.ObjectScope;
+import cn.reghao.tnb.file.api.constant.ObjectType;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.console.app.model.vo.KeyValue;
 import cn.reghao.oss.console.app.model.vo.UploadChannelVo;

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/model/vo/StoreNodeVO.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.model.vo;
 
 import cn.reghao.oss.console.app.model.po.StoreNode;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.StoreInfo;
 import lombok.Getter;
 

+ 2 - 2
oss-console/src/main/java/cn/reghao/oss/console/app/model/vo/UploadChannelVo.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.model.vo;
 
-import cn.reghao.oss.storeapi.constant.ObjectScope;
-import cn.reghao.oss.storeapi.constant.ObjectType;
+import cn.reghao.tnb.file.api.constant.ObjectScope;
+import cn.reghao.tnb.file.api.constant.ObjectType;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import lombok.Getter;
 

+ 2 - 2
oss-console/src/main/java/cn/reghao/oss/console/app/rpc/MediaRpcService.java

@@ -3,8 +3,8 @@ package cn.reghao.oss.console.app.rpc;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.service.UploadChannelService;
 import cn.reghao.oss.console.util.AuthKeyContext;
-import cn.reghao.oss.storeapi.dto.media.*;
-import cn.reghao.oss.storeapi.iface.MediaService;
+import cn.reghao.tnb.file.api.dto.media.*;
+import cn.reghao.tnb.file.api.iface.MediaService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 2 - 2
oss-console/src/main/java/cn/reghao/oss/console/app/rpc/OssObjectService.java

@@ -5,8 +5,8 @@ import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.console.app.service.UploadChannelService;
 import cn.reghao.oss.console.util.AuthKeyContext;
-import cn.reghao.oss.storeapi.dto.ObjectInfo;
-import cn.reghao.oss.storeapi.iface.ObjectService;
+import cn.reghao.tnb.file.api.dto.ObjectInfo;
+import cn.reghao.tnb.file.api.iface.ObjectService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/service/OssStoreService.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.service;
 
 import cn.reghao.oss.console.app.model.po.StoreNode;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.StoreNodeDto;
 import cn.reghao.oss.storeapi.dto.StoreProperties;
 import org.springframework.stereotype.Service;

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/service/UploadChannelService.java

@@ -6,7 +6,7 @@ import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.oss.console.app.model.dto.ChannelProcessDto;
 import cn.reghao.oss.console.app.rpc.RemoteService;
 import cn.reghao.oss.console.util.AuthKeyContext;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.iface.StoreService;
 import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.db.repository.UploadChannelRepository;

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/service/UserKeyService.java

@@ -3,7 +3,7 @@ package cn.reghao.oss.console.app.service;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.security.RandomString;
 import cn.reghao.oss.console.app.model.vo.UserKeyVo;
-import cn.reghao.oss.storeapi.constant.ChannelAction;
+import cn.reghao.tnb.file.api.constant.ChannelAction;
 import cn.reghao.oss.storeapi.dto.OssPayload;
 import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.db.repository.UserKeyRepository;

+ 1 - 1
oss-console/src/test/java/OssConsoleTest.java

@@ -1,4 +1,4 @@
-import cn.reghao.oss.storeapi.constant.ObjectScope;
+import cn.reghao.tnb.file.api.constant.ObjectScope;
 import cn.reghao.oss.console.OssConsoleApplication;
 import cn.reghao.oss.console.account.service.AccountService;
 import cn.reghao.oss.console.app.model.dto.UploadChannelDto;

+ 3 - 3
oss-sdk/src/main/java/cn/reghao/oss/sdk/OssConsoleClient.java

@@ -3,11 +3,11 @@ package cn.reghao.oss.sdk;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.oss.sdk.model.OssStoreConfig;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
-import cn.reghao.oss.storeapi.dto.ObjectInfo;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectInfo;
 import cn.reghao.oss.storeapi.dto.ServerInfo;
 import cn.reghao.oss.storeapi.dto.StoreProperties;
-import cn.reghao.oss.storeapi.dto.media.*;
+import cn.reghao.tnb.file.api.dto.media.*;
 import cn.reghao.oss.storeapi.rest.UploadFileRet;
 import com.google.gson.reflect.TypeToken;
 

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/config/SpringLifecycle.java

@@ -2,7 +2,7 @@ package cn.reghao.oss.store.config;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.oss.sdk.OssConsoleClient;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.StoreDiskDto;
 import cn.reghao.oss.storeapi.dto.StoreNodeDto;
 import cn.reghao.oss.storeapi.dto.StoreProperties;

+ 3 - 3
oss-store/src/main/java/cn/reghao/oss/store/controller/ObjectGetController.java

@@ -1,8 +1,8 @@
 package cn.reghao.oss.store.controller;
 
-import cn.reghao.oss.storeapi.constant.ChannelAction;
-import cn.reghao.oss.storeapi.constant.ObjectScope;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.constant.ChannelAction;
+import cn.reghao.tnb.file.api.constant.ObjectScope;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.ObjectMeta;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.service.GetObjectService;

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/controller/ObjectUploadController.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.controller;
 
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.store.model.vo.ObjectProp;
 import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.service.*;

+ 45 - 4
oss-store/src/main/java/cn/reghao/oss/store/rpc/MediaServiceImpl.java

@@ -1,9 +1,13 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.oss.storeapi.dto.media.*;
-import cn.reghao.oss.storeapi.iface.MediaService;
+import cn.reghao.oss.store.db.repository.ObjectRepository;
+import cn.reghao.oss.store.model.po.FileMeta;
+import cn.reghao.oss.store.service.ObjectNameService;
+import cn.reghao.oss.store.service.SignService;
+import cn.reghao.tnb.file.api.dto.media.*;
 import cn.reghao.oss.store.task.MediaFileProcessor;
 import cn.reghao.oss.store.util.UserContext;
+import cn.reghao.tnb.file.api.iface.MediaService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
@@ -21,11 +25,45 @@ import java.util.List;
 public class MediaServiceImpl implements MediaService {
     private final LocalDateTime epoch = LocalDateTime.parse("1970-01-01T08:00");
     private final MediaFileProcessor mediaFileProcessor;
+    private ObjectRepository objectRepository;
+    private ObjectNameService objectNameService;
+    private SignService signService;
 
     public MediaServiceImpl(MediaFileProcessor mediaFileProcessor) {
         this.mediaFileProcessor = mediaFileProcessor;
     }
 
+    public VideoInfo getVideoInfo(int channelId, String objectId) {
+        return null;
+    }
+
+    public ImageInfo getImageInfo(int channelId, String objectId) {
+        return null;
+    }
+
+
+    public List<ConvertedImageInfo> getWebpInfo(int channelId, List<String> objectIds) {
+        return null;
+    }
+
+    public AudioInfo getAudioInfo(int channelId, String objectId) {
+        return null;
+    }
+
+
+    public String getSignedUrl(int loginUser, String objectId, int expireSecond) {
+        FileMeta fileMeta = objectRepository.getByObjectId(objectId);
+        String objectName = fileMeta.getObjectName();
+        String url = objectNameService.getObjectUrl(objectName);
+        String signedUrl = signService.getSignedUrl(loginUser, url, expireSecond);
+        return signedUrl;
+    }
+
+    public String getSignedUrl(int channelId, String uploadId) {
+        return null;
+    }
+
+    @Deprecated
     public VideoInfo getVideoInfo(String videoFileId) {
         try {
             VideoInfo videoInfo = mediaFileProcessor.getVideoInfo(videoFileId);
@@ -37,6 +75,7 @@ public class MediaServiceImpl implements MediaService {
         return null;
     }
 
+    @Deprecated
     public ImageInfo getImageInfo(String imageFileId) {
         try {
             ImageInfo imageInfo = mediaFileProcessor.getImageInfo(imageFileId);
@@ -49,16 +88,18 @@ public class MediaServiceImpl implements MediaService {
         return null;
     }
 
+    @Deprecated
     public List<ImageInfo> getImagesInfo(List<String> imageFileIds) {
         return mediaFileProcessor.getImagesInfo(imageFileIds);
     }
 
-    public List<ConvertedImageInfo> getWebpInfo(int loginUser, List<String> imageFileIds) {
+    @Deprecated
+    public List<ConvertedImageInfo> getWebpInfo1(int loginUser, List<String> imageFileIds) {
         UserContext userContext = new UserContext(loginUser);
         return mediaFileProcessor.getWebpInfos(imageFileIds);
     }
 
-    @Override
+    @Deprecated
     public AudioInfo getAudioInfo(String audioFileId) {
         try {
             AudioInfo audioInfo = mediaFileProcessor.getAudioInfo(audioFileId);

+ 28 - 16
oss-store/src/main/java/cn/reghao/oss/store/rpc/ObjectServiceImpl.java

@@ -1,14 +1,15 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.oss.storeapi.constant.ObjectScope;
+import cn.reghao.tnb.file.api.constant.ObjectScope;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.po.FileMeta;
 import cn.reghao.oss.store.service.ObjectNameService;
-import cn.reghao.oss.storeapi.dto.ObjectInfo;
-import cn.reghao.oss.storeapi.iface.ObjectService;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectInfo;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import cn.reghao.oss.store.service.SignService;
 import cn.reghao.oss.store.service.StoreLocalService;
+import cn.reghao.tnb.file.api.iface.ObjectService;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 
@@ -37,7 +38,27 @@ public class ObjectServiceImpl implements ObjectService {
         this.storeLocalService = storeLocalService;
     }
 
-    @Override
+    public void setObjectsScope(int channelId, List<String> objectIds, int scope) {
+
+    }
+
+    public void deleteByObjectIds(int channelId, List<String> objectIds) {
+
+    }
+
+    public void deleteByObjectUrl(String objectUrl) {
+
+    }
+
+    public ObjectInfo getObjectInfo(int channelId, String objectId) {
+        return null;
+    }
+
+    public ObjectChannel getObjectChannel(int channelId) {
+        return null;
+    }
+
+    @Deprecated
     public void setObjectsScope(int scope, List<String> objectIds) {
         if (objectIds.isEmpty()) {
             return;
@@ -49,7 +70,7 @@ public class ObjectServiceImpl implements ObjectService {
         });
     }
 
-    @Override
+    @Deprecated
     public void deleteByObjectIds(List<String> objectIds) {
         objectIds.forEach(objectId -> {
             FileMeta fileMeta = objectRepository.getByObjectId(objectId);
@@ -57,22 +78,13 @@ public class ObjectServiceImpl implements ObjectService {
         });
     }
 
-    @Override
+    @Deprecated
     public void deleteByObjectName(String objectName) {
         FileMeta fileMeta = objectRepository.getByObjectName(objectName);
         objectRepository.deleteObject(fileMeta);
     }
 
-    @Override
-    public String getSignedUrl(int loginUser, String objectId, int expireSecond) {
-        FileMeta fileMeta = objectRepository.getByObjectId(objectId);
-        String objectName = fileMeta.getObjectName();
-        String url = objectNameService.getObjectUrl(objectName);
-        String signedUrl = signService.getSignedUrl(loginUser, url, expireSecond);
-        return signedUrl;
-    }
-
-    @Override
+    @Deprecated
     public ObjectInfo getObjectInfo(int loginUser, String objectId, int expireSecond) {
         FileMeta fileMeta = fileMetaMapper.findByObjectId(objectId);
         if (fileMeta == null) {

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

@@ -1,13 +1,17 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.oss.storeapi.constant.ObjectScope;
+import cn.reghao.tnb.file.api.constant.ObjectScope;
 import cn.reghao.oss.store.service.FileStoreService;
 import cn.reghao.oss.store.service.ObjectNameService;
 import cn.reghao.oss.store.service.StoreLocalService;
 import cn.reghao.oss.store.util.JwtUtil;
-import cn.reghao.oss.storeapi.constant.ChannelAction;
-import cn.reghao.oss.storeapi.dto.*;
+import cn.reghao.tnb.file.api.constant.ChannelAction;
+import cn.reghao.oss.storeapi.dto.OssPayload;
+import cn.reghao.oss.storeapi.dto.StoreDiskDto;
+import cn.reghao.oss.storeapi.dto.StoreInfo;
+import cn.reghao.oss.storeapi.dto.StoreProperties;
 import cn.reghao.oss.storeapi.iface.StoreService;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 

+ 2 - 2
oss-store/src/main/java/cn/reghao/oss/store/service/ChannelValidateService.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.storeapi.constant.ObjectType;
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.constant.ObjectType;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.store.util.FileType;
 import cn.reghao.jutil.jdk.result.Result;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/service/ObjectMultipartUploadService.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import cn.reghao.oss.store.model.dto.PathUrl;
 import cn.reghao.oss.store.model.vo.ObjectProp;

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/service/ObjectNameService.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.po.FileMeta;
 import cn.reghao.oss.store.model.vo.ObjectProp;

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/service/SignService.java

@@ -2,7 +2,7 @@ package cn.reghao.oss.store.service;
 
 import cn.reghao.oss.store.util.JwtUtil;
 import cn.reghao.oss.store.util.SignatureUtil;
-import cn.reghao.oss.storeapi.constant.ChannelAction;
+import cn.reghao.tnb.file.api.constant.ChannelAction;
 import cn.reghao.oss.storeapi.dto.OssPayload;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/service/StoreLocalService.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.StoreProperties;
 import org.springframework.stereotype.Service;
 

+ 4 - 4
oss-store/src/main/java/cn/reghao/oss/store/task/MediaFileProcessor.java

@@ -8,10 +8,10 @@ import cn.reghao.jutil.media.model.AudioProps;
 import cn.reghao.jutil.media.model.MediaProps;
 import cn.reghao.jutil.media.model.VideoProps;
 import cn.reghao.oss.storeapi.dto.ObjectMeta;
-import cn.reghao.oss.storeapi.dto.media.AudioInfo;
-import cn.reghao.oss.storeapi.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.storeapi.dto.media.ImageInfo;
-import cn.reghao.oss.storeapi.dto.media.VideoInfo;
+import cn.reghao.tnb.file.api.dto.media.AudioInfo;
+import cn.reghao.tnb.file.api.dto.media.ConvertedImageInfo;
+import cn.reghao.tnb.file.api.dto.media.ImageInfo;
+import cn.reghao.tnb.file.api.dto.media.VideoInfo;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.service.FileStoreService;

+ 2 - 2
oss-store/src/main/java/cn/reghao/oss/store/util/FileType.java

@@ -1,8 +1,8 @@
 package cn.reghao.oss.store.util;
 
 import cn.reghao.jutil.jdk.shell.Shell;
-import cn.reghao.oss.storeapi.constant.ObjectType;
-import cn.reghao.oss.storeapi.constant.VideoUrlType;
+import cn.reghao.tnb.file.api.constant.ObjectType;
+import cn.reghao.tnb.file.api.constant.VideoUrlType;
 import org.apache.tika.Tika;
 import org.apache.tika.metadata.Metadata;
 

+ 5 - 0
store-api/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>jdk</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.reghao.tnb.file</groupId>
+            <artifactId>file-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>

+ 0 - 55
store-api/src/main/java/cn/reghao/oss/storeapi/constant/ChannelAction.java

@@ -1,55 +0,0 @@
-package cn.reghao.oss.storeapi.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2023-10-18 13:15:45
- */
-public enum ChannelAction {
-    access(1, "访问"),
-    download(2, "下载"),
-    upload(3, "上传"),
-    delete(4, "删除"),
-    all(5, "all");
-
-    private final int code;
-    private final String desc;
-
-    private static Map<Integer, String> descMap = new HashMap<>();
-    static {
-        for (ChannelAction scope : ChannelAction.values()) {
-            descMap.put(scope.code, scope.desc);
-        }
-    }
-
-    ChannelAction(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public String getName() {
-        return this.name();
-    }
-
-    /**
-     * 提供给 @ValidEnum 调用
-     *
-     * @param
-     * @return
-     * @date 2023-10-11 14:44:42
-     */
-    public int getValue() {
-        return this.code;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    // TODO 第一次调用时会初始化 descMap
-    public static String getDescByCode(int code) {
-        return descMap.get(code);
-    }
-}

+ 0 - 56
store-api/src/main/java/cn/reghao/oss/storeapi/constant/ObjectScope.java

@@ -1,56 +0,0 @@
-package cn.reghao.oss.storeapi.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 描述资源的可见范围
- *
- * @author reghao
- * @date 2023-05-19 18:15:45
- */
-public enum ObjectScope {
-    PRIVATE(1, "本人可见"),
-    PUBLIC(2, "所有人可见");
-
-    private final int code;
-    private final String desc;
-    private static final Map<Integer, ObjectScope> map = new HashMap<>();
-    static {
-        for (ObjectScope scope : ObjectScope.values()) {
-            map.put(scope.code, scope);
-        }
-    }
-
-    ObjectScope(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public String getName() {
-        return this.name();
-    }
-
-    /**
-     * 提供给 @ValidEnum 调用
-     *
-     * @param
-     * @return
-     * @date 2023-10-11 14:44:42
-     */
-    public int getValue() {
-        return this.code;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public static ObjectScope getByCode(int code) {
-        return map.get(code);
-    }
-}

+ 0 - 65
store-api/src/main/java/cn/reghao/oss/storeapi/constant/ObjectType.java

@@ -1,65 +0,0 @@
-package cn.reghao.oss.storeapi.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2023-06-13 15:09:09
- */
-public enum ObjectType {
-    Dir(1000, "directory"),
-    Image(1001, "image"),
-    Video(1002, "video"),
-    Audio(1003, "audio"),
-    Text(1004, "text"),
-    Other(1005, "application");
-
-    private final int code;
-    private final String desc;
-    ObjectType(int code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    private static Map<Integer, ObjectType> map = new HashMap<>();
-    static {
-        for (ObjectType type : ObjectType.values()) {
-            map.put(type.code, type);
-        }
-    }
-
-    private static Map<Integer, String> descMap = new HashMap<>();
-    static {
-        for (ObjectType objectType : ObjectType.values()) {
-            descMap.put(objectType.code, objectType.desc);
-        }
-    }
-
-    public static ObjectType getByCode(int code) {
-        return map.get(code);
-    }
-
-    /**
-     * 提供给 @ValidEnum 调用
-     *
-     * @param
-     * @return
-     * @date 2023-10-11 14:44:42
-     */
-    public int getValue() {
-        return this.code;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public static String getDescByCode(int code) {
-        return descMap.get(code);
-    }
-}

+ 0 - 15
store-api/src/main/java/cn/reghao/oss/storeapi/constant/SupportedMedia.java

@@ -1,15 +0,0 @@
-package cn.reghao.oss.storeapi.constant;
-
-import java.util.Set;
-
-/**
- * 系统支持的媒体文件格式
- *
- * @author reghao
- * @date 2023-10-09 10:34:42
- */
-public class SupportedMedia {
-    public static final Set<String> videoCodecs = Set.of("h264");
-    public static final Set<String> audioCodecs = Set.of("aac", "mp3");
-    public static final Set<String> imageFormats = Set.of("jpeg", "jpg", "webp", "gif", "png");
-}

+ 0 - 11
store-api/src/main/java/cn/reghao/oss/storeapi/constant/VideoUrlType.java

@@ -1,11 +0,0 @@
-package cn.reghao.oss.storeapi.constant;
-
-/**
- * 视频 URL 类型
- *
- * @author reghao
- * @date 2021-12-28 15:49:19
- */
-public enum VideoUrlType {
-    mp4, hls, dash, flv
-}

+ 0 - 19
store-api/src/main/java/cn/reghao/oss/storeapi/dto/DownloadUrl.java

@@ -1,19 +0,0 @@
-package cn.reghao.oss.storeapi.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2023-08-24 15:01:43
- */
-@AllArgsConstructor
-@Getter
-public class DownloadUrl implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String url;
-    private String token;
-}

+ 0 - 26
store-api/src/main/java/cn/reghao/oss/storeapi/dto/ObjectChannel.java

@@ -1,26 +0,0 @@
-package cn.reghao.oss.storeapi.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2024-02-26 10:08:12
- */
-@AllArgsConstructor
-@Getter
-public class ObjectChannel implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Integer channelId;
-    private String name;
-    private String prefix;
-    private Long maxSize;
-    private Integer fileType;
-    private Boolean seturl;
-    private Integer scope;
-    private String domain;
-    private Integer createBy;
-}

+ 0 - 31
store-api/src/main/java/cn/reghao/oss/storeapi/dto/ObjectInfo.java

@@ -1,31 +0,0 @@
-package cn.reghao.oss.storeapi.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2023-11-29 18:11:13
- */
-@Setter
-@Getter
-public class ObjectInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String objectId;
-    private String objectName;
-    private String url;
-    private int fileType;
-    private String filename;
-    private long size;
-
-    public ObjectInfo(String objectId, String objectName, int fileType, String filename, long size) {
-        this.objectId = objectId;
-        this.objectName = objectName;
-        this.fileType = fileType;
-        this.filename = filename;
-        this.size = size;
-    }
-}

+ 1 - 0
store-api/src/main/java/cn/reghao/oss/storeapi/dto/StoreInfo.java

@@ -1,5 +1,6 @@
 package cn.reghao.oss.storeapi.dto;
 
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

+ 0 - 24
store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/AudioInfo.java

@@ -1,24 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2023-08-28 17:00:56
- */
-@AllArgsConstructor
-@Getter
-public class AudioInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String audioFileId;
-    private String objectId;
-    private int duration;
-    private String codec;
-    private Long bitRate;
-    private String url;
-}

+ 0 - 21
store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/ConvertedImageInfo.java

@@ -1,21 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2024-03-08 17:07:23
- */
-@AllArgsConstructor
-@Getter
-public class ConvertedImageInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String imageFileId;
-    private String objectId;
-    private String format;
-    private String url;
-}

+ 0 - 24
store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/ImageInfo.java

@@ -1,24 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2024-03-08 10:56:27
- */
-@AllArgsConstructor
-@Getter
-public class ImageInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // 原始文件的 objectId
-    private String imageFileId;
-    private String objectId;
-    private String format;
-    private String url;
-    private Integer width;
-    private Integer height;
-}

+ 0 - 32
store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/VideoInfo.java

@@ -1,32 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author reghao
- * @date 2023-01-11 10:41:53
- */
-@AllArgsConstructor
-@Getter
-public class VideoInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String videoFileId;
-    private String objectId;
-    private String videoCodec;
-    private Long vbitRate;
-    private String audioCodec;
-    private Long abitRate;
-    private String urlType;
-    private String url;
-    private String quality;
-    private Integer width;
-    private Integer height;
-    // 单位秒
-    private Integer duration;
-    private LocalDateTime createTime;
-}

+ 0 - 15
store-api/src/main/java/cn/reghao/oss/storeapi/iface/MediaService.java

@@ -1,15 +0,0 @@
-package cn.reghao.oss.storeapi.iface;
-
-import cn.reghao.oss.storeapi.dto.media.*;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2024-03-07 09:51:23
- */
-public interface MediaService {
-    VideoInfo getVideoInfo(String videoFileId);
-    List<ImageInfo> getImagesInfo(List<String> imageFileIds);
-    AudioInfo getAudioInfo(String audioFileId);
-}

+ 0 - 17
store-api/src/main/java/cn/reghao/oss/storeapi/iface/ObjectService.java

@@ -1,17 +0,0 @@
-package cn.reghao.oss.storeapi.iface;
-
-import cn.reghao.oss.storeapi.dto.ObjectInfo;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-05-28 23:25:06
- */
-public interface ObjectService {
-    void setObjectsScope(int scope, List<String> objectIds);
-    void deleteByObjectIds(List<String> objectIds);
-    void deleteByObjectName(String objectName);
-    String getSignedUrl(int loginUser, String objectId, int expireSecond);
-    ObjectInfo getObjectInfo(int loginUser, String objectId, int expireSecond);
-}

+ 1 - 1
store-api/src/main/java/cn/reghao/oss/storeapi/iface/StoreService.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.storeapi.iface;
 
-import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.tnb.file.api.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.StoreInfo;
 import cn.reghao.oss.storeapi.dto.StoreProperties;