Quellcode durchsuchen

将 oss-api 中涉及到第三方调用的 model 放到 oss-sdk 中, 对第三方不暴露 oss-api

reghao vor 1 Jahr
Ursprung
Commit
edfd8404ef
41 geänderte Dateien mit 107 neuen und 63 gelöschten Zeilen
  1. 6 0
      oss-api/pom.xml
  2. 1 1
      oss-api/src/main/java/cn/reghao/oss/api/iface/ConsoleService.java
  3. 5 5
      oss-api/src/main/java/cn/reghao/oss/api/iface/StoreService.java
  4. 1 1
      oss-media/src/test/java/FileMetaTest.java
  5. 6 6
      oss-sdk/pom.xml
  6. 3 3
      oss-sdk/src/main/java/cn/reghao/oss/sdk/ObjectMultipartUploadService.java
  7. 4 4
      oss-sdk/src/main/java/cn/reghao/oss/sdk/OssConsoleClient.java
  8. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/OssStoreClient.java
  9. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/constant/ObjectScope.java
  10. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/constant/ObjectType.java
  11. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/ObjectInfo.java
  12. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/ServerInfo.java
  13. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/AudioInfo.java
  14. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/AudioUrl.java
  15. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/ConvertedImageInfo.java
  16. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/ImageInfo.java
  17. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/ImageUrlDto.java
  18. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/VideoInfo.java
  19. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/VideoUrlDto.java
  20. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadFilePart.java
  21. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadFileRet.java
  22. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadPrepare.java
  23. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadPrepareRet.java
  24. 1 1
      oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadedPart.java
  25. 13 6
      oss-sdk/src/test/java/OssConsoleClientTest.java
  26. 5 0
      oss-store/pom.xml
  27. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/controller/ObjectGetController.java
  28. 3 1
      oss-store/src/main/java/cn/reghao/oss/store/controller/ObjectMultipartUploadController.java
  29. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/controller/ObjectUploadController.java
  30. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/db/mapper/FileMetaMapper.java
  31. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/db/repository/ObjectRepository.java
  32. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/model/po/FileMultipart.java
  33. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/model/po/FilePart.java
  34. 6 5
      oss-store/src/main/java/cn/reghao/oss/store/rpc/StoreServiceImpl.java
  35. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/service/ChannelValidateService.java
  36. 3 1
      oss-store/src/main/java/cn/reghao/oss/store/service/ObjectMultipartUploadService.java
  37. 4 4
      oss-store/src/main/java/cn/reghao/oss/store/task/MediaFileProcessor.java
  38. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/task/VideoFileProcessor.java
  39. 1 1
      oss-store/src/main/java/cn/reghao/oss/store/util/FileType.java
  40. 16 0
      oss-store/src/test/java/MediaTest.java
  41. 5 0
      zzz/deploy.sh

+ 6 - 0
oss-api/pom.xml

@@ -26,6 +26,12 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.reghao.oss</groupId>
+            <artifactId>oss-sdk</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

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

@@ -2,7 +2,7 @@ package cn.reghao.oss.api.iface;
 
 import cn.reghao.oss.api.dto.NodeProperties;
 import cn.reghao.oss.api.dto.ObjectChannel;
-import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.oss.sdk.model.dto.ServerInfo;
 import cn.reghao.oss.api.dto.StoreNodeDto;
 
 /**

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

@@ -1,12 +1,12 @@
 package cn.reghao.oss.api.iface;
 
 import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.sdk.model.dto.ObjectInfo;
 import cn.reghao.oss.api.dto.disk.DiskVolume;
-import cn.reghao.oss.api.dto.media.AudioInfo;
-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 cn.reghao.oss.sdk.model.dto.media.AudioInfo;
+import cn.reghao.oss.sdk.model.dto.media.ConvertedImageInfo;
+import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
+import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
 
 import java.util.List;
 

+ 1 - 1
oss-media/src/test/java/FileMetaTest.java

@@ -1,5 +1,5 @@
 import cn.reghao.oss.api.dto.ObjectMeta;
-import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
 import cn.reghao.oss.api.rest.UploadFileRet;
 import cn.reghao.oss.store.OssMediaApplication;
 import cn.reghao.oss.store.db.mapper.DataBlockMapper;

+ 6 - 6
oss-sdk/pom.xml

@@ -20,12 +20,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.reghao.oss</groupId>
-            <artifactId>oss-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>cn.reghao.jutil</groupId>
             <artifactId>jdk</artifactId>
@@ -53,5 +47,11 @@
             <artifactId>logback-classic</artifactId>
             <version>1.2.3</version>
         </dependency>
+
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -8,9 +8,9 @@ import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.tool.http.DefaultWebRequest;
-import cn.reghao.oss.api.rest.UploadFilePart;
-import cn.reghao.oss.api.rest.UploadFileRet;
-import cn.reghao.oss.api.rest.UploadedPart;
+import cn.reghao.oss.sdk.model.rest.UploadFilePart;
+import cn.reghao.oss.sdk.model.rest.UploadFileRet;
+import cn.reghao.oss.sdk.model.rest.UploadedPart;
 import com.google.gson.reflect.TypeToken;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -3,10 +3,10 @@ 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.OssConsoleConfig;
-import cn.reghao.oss.api.dto.ObjectInfo;
-import cn.reghao.oss.api.dto.ServerInfo;
-import cn.reghao.oss.api.dto.media.*;
-import cn.reghao.oss.api.rest.UploadFileRet;
+import cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.sdk.model.dto.ServerInfo;
+import cn.reghao.oss.sdk.model.dto.media.*;
+import cn.reghao.oss.sdk.model.rest.UploadFileRet;
 import com.google.gson.reflect.TypeToken;
 
 import java.io.File;

+ 1 - 1
oss-sdk/src/main/java/cn/reghao/oss/sdk/OssStoreClient.java

@@ -6,7 +6,7 @@ import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.tool.http.DefaultWebRequest;
-import cn.reghao.oss.api.rest.UploadFileRet;
+import cn.reghao.oss.sdk.model.rest.UploadFileRet;
 import com.google.gson.reflect.TypeToken;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/constant/ObjectScope.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/constant/ObjectScope.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.constant;
+package cn.reghao.oss.sdk.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/constant/ObjectType.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/constant/ObjectType.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.constant;
+package cn.reghao.oss.sdk.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/ObjectInfo.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/ObjectInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto;
+package cn.reghao.oss.sdk.model.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/ServerInfo.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/ServerInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto;
+package cn.reghao.oss.sdk.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/media/AudioInfo.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/AudioInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto.media;
+package cn.reghao.oss.sdk.model.dto.media;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/media/AudioUrl.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/AudioUrl.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto.media;
+package cn.reghao.oss.sdk.model.dto.media;
 
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/media/ConvertedImageInfo.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/ConvertedImageInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto.media;
+package cn.reghao.oss.sdk.model.dto.media;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/media/ImageInfo.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/ImageInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto.media;
+package cn.reghao.oss.sdk.model.dto.media;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/media/ImageUrlDto.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/ImageUrlDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto.media;
+package cn.reghao.oss.sdk.model.dto.media;
 
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/media/VideoInfo.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/VideoInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto.media;
+package cn.reghao.oss.sdk.model.dto.media;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/media/VideoUrlDto.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/dto/media/VideoUrlDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.dto.media;
+package cn.reghao.oss.sdk.model.dto.media;
 
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/rest/UploadFilePart.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadFilePart.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.rest;
+package cn.reghao.oss.sdk.model.rest;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/rest/UploadFileRet.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadFileRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.rest;
+package cn.reghao.oss.sdk.model.rest;
 
 import lombok.Getter;
 

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/rest/UploadPrepare.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadPrepare.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.rest;
+package cn.reghao.oss.sdk.model.rest;
 
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/rest/UploadPrepareRet.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadPrepareRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.rest;
+package cn.reghao.oss.sdk.model.rest;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
oss-api/src/main/java/cn/reghao/oss/api/rest/UploadedPart.java → oss-sdk/src/main/java/cn/reghao/oss/sdk/model/rest/UploadedPart.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.api.rest;
+package cn.reghao.oss.sdk.model.rest;
 
 import lombok.Getter;
 import lombok.Setter;

+ 13 - 6
oss-sdk/src/test/java/OssConsoleClientTest.java

@@ -1,3 +1,4 @@
+import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
 import cn.reghao.oss.sdk.model.OssConsoleConfig;
 import cn.reghao.oss.api.rest.UploadFileRet;
 import cn.reghao.oss.sdk.OssConsoleClient;
@@ -20,15 +21,21 @@ public class OssConsoleClientTest {
 
         String filePath = "";
         File file = new File(filePath);
-        int channelCode = 114;
-        UploadFileRet uploadFileRet = ossConsoleClient.putObject(file, channelCode);
+//        int channelCode = 114;
+//        UploadFileRet uploadFileRet = ossConsoleClient.putObject(file, channelCode);
         /*UploadFileRet uploadFileRet1 = ossConsoleClient.postObject(file, channelCode);
         UploadFileRet uploadFileRet2 = ossConsoleClient.postObjectByMultiparts(file, channelCode);*/
 
-        String objectName = "video/playback/28d0fd95e224499c9f2cf1d98b4551a5.flv";
-        String localPath  = ossConsoleClient.getObject(objectName);
+//        String objectName = "video/playback/28d0fd95e224499c9f2cf1d98b4551a5.flv";
+//        String localPath  = ossConsoleClient.getObject(objectName);
 
-        String sha256sum = "1234567890";
-        boolean exist = ossConsoleClient.headObject(sha256sum);
+//        String sha256sum = "1234567890";
+//        boolean exist = ossConsoleClient.headObject(sha256sum);
+
+        int channelCode = 104;
+        String objectId = "749ede6adf704e57be8c5ef94dd5928a";
+        int loginUser = 2;
+        ImageInfo imageInfo = ossConsoleClient.getImageInfo(channelCode, objectId);
+        System.out.println();
     }
 }

+ 5 - 0
oss-store/pom.xml

@@ -58,6 +58,11 @@
             <artifactId>oss-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.reghao.oss</groupId>
+            <artifactId>oss-sdk</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>

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

@@ -2,7 +2,7 @@ package cn.reghao.oss.store.controller;
 
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.api.constant.ChannelAction;
-import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.sdk.model.constant.ObjectScope;
 import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.oss.api.iface.ConsoleService;

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

@@ -6,9 +6,11 @@ import cn.reghao.oss.api.dto.OssPayload;
 import cn.reghao.oss.api.iface.ConsoleService;
 import cn.reghao.oss.api.util.AuthContext;
 import cn.reghao.oss.api.util.JwtUtil;
+import cn.reghao.oss.sdk.model.rest.UploadFilePart;
+import cn.reghao.oss.sdk.model.rest.UploadFileRet;
+import cn.reghao.oss.sdk.model.rest.UploadedPart;
 import cn.reghao.oss.store.service.ObjectMultipartUploadService;
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.api.rest.*;
 import com.github.benmanes.caffeine.cache.Cache;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -3,6 +3,7 @@ package cn.reghao.oss.store.controller;
 import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.api.iface.ConsoleService;
 import cn.reghao.oss.api.util.AuthContext;
+import cn.reghao.oss.sdk.model.rest.UploadFileRet;
 import cn.reghao.oss.store.model.vo.ObjectProp;
 import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.service.*;
@@ -12,7 +13,6 @@ import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.api.dto.OssPayload;
-import cn.reghao.oss.api.rest.UploadFileRet;
 import com.github.benmanes.caffeine.cache.Cache;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/db/mapper/FileMetaMapper.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.store.db.mapper;
 
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.sdk.model.dto.ObjectInfo;
 import cn.reghao.oss.store.model.po.FileMeta;
 import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.jutil.jdk.db.BaseMapper;

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

@@ -1,7 +1,7 @@
 package cn.reghao.oss.store.db.repository;
 
 import cn.reghao.jutil.jdk.db.Page;
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.sdk.model.dto.ObjectInfo;
 import cn.reghao.oss.store.db.mapper.DataBlockMapper;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import cn.reghao.oss.store.model.po.DataBlock;

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/model/po/FileMultipart.java

@@ -1,8 +1,8 @@
 package cn.reghao.oss.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.api.rest.UploadFilePart;
 import cn.reghao.oss.api.util.AuthContext;
+import cn.reghao.oss.sdk.model.rest.UploadFilePart;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/model/po/FilePart.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.api.rest.UploadFilePart;
+import cn.reghao.oss.sdk.model.rest.UploadFilePart;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

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

@@ -3,13 +3,14 @@ package cn.reghao.oss.store.rpc;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.security.RandomString;
 import cn.reghao.oss.api.constant.ChannelAction;
-import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.sdk.model.constant.ObjectScope;
 import cn.reghao.oss.api.dto.*;
 import cn.reghao.oss.api.dto.disk.DiskVolume;
-import cn.reghao.oss.api.dto.media.AudioInfo;
-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 cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.sdk.model.dto.media.AudioInfo;
+import cn.reghao.oss.sdk.model.dto.media.ConvertedImageInfo;
+import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
+import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
 import cn.reghao.oss.api.util.JwtUtil;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.po.FileMeta;

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

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.oss.sdk.model.constant.ObjectType;
 import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.store.util.FileType;
 import cn.reghao.jutil.jdk.result.Result;

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

@@ -2,7 +2,9 @@ package cn.reghao.oss.store.service;
 
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.api.dto.ObjectChannel;
-import cn.reghao.oss.api.rest.*;
+import cn.reghao.oss.sdk.model.rest.UploadFilePart;
+import cn.reghao.oss.sdk.model.rest.UploadFileRet;
+import cn.reghao.oss.sdk.model.rest.UploadedPart;
 import cn.reghao.oss.store.db.repository.FilePartRepository;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.po.FilePart;

+ 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.api.dto.ObjectMeta;
-import cn.reghao.oss.api.dto.media.AudioInfo;
-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 cn.reghao.oss.sdk.model.dto.media.AudioInfo;
+import cn.reghao.oss.sdk.model.dto.media.ConvertedImageInfo;
+import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
+import cn.reghao.oss.sdk.model.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;

+ 1 - 1
oss-store/src/main/java/cn/reghao/oss/store/task/VideoFileProcessor.java

@@ -2,6 +2,7 @@ package cn.reghao.oss.store.task;
 
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.oss.api.dto.ObjectMeta;
+import cn.reghao.oss.sdk.model.rest.UploadFileRet;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.vo.ObjectProp;
 import cn.reghao.oss.store.service.FileStoreService;
@@ -15,7 +16,6 @@ import cn.reghao.oss.store.service.ObjectNameService;
 import cn.reghao.jutil.media.FFmpegWrapper;
 import cn.reghao.jutil.media.MediaQuality;
 import cn.reghao.jutil.media.MediaResolution;
-import cn.reghao.oss.api.rest.UploadFileRet;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

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

+ 16 - 0
oss-store/src/test/java/MediaTest.java

@@ -0,0 +1,16 @@
+import cn.reghao.jutil.media.FFmpegWrapper;
+import cn.reghao.jutil.media.model.MediaProps;
+import org.junit.Test;
+
+/**
+ * @author reghao
+ * @date 2024-11-09 23:00:44
+ */
+public class MediaTest {
+    @Test
+    public void videoTest() throws Exception {
+        String absolutePath = "/home/reghao/mnt/1/video/mmexport1715150192903.mp4";
+        MediaProps mediaProps = FFmpegWrapper.getMediaProps(absolutePath);
+        System.out.println();
+    }
+}

+ 5 - 0
zzz/deploy.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mvn clean deploy -Dmaven.test.skip=true -am -pl oss-api
+mvn clean deploy -Dmaven.test.skip=true -am -pl oss-sdk
+