将 oss-sdk 中的 model 迁移到 oss-api

oss-api/pom.xml

@@ -26,12 +26,6 @@
             <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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.sdk.model.dto.ServerInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.oss.api.dto.StoreNodeDto;
 
 /**

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.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.oss.api.dto.disk.DiskVolume;
-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.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 java.util.List;
 

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,4 @@
 import cn.reghao.oss.api.dto.ObjectMeta;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
 import cn.reghao.oss.store.OssMediaApplication;
 import cn.reghao.oss.store.db.mapper.DataBlockMapper;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
@@ -8,7 +7,6 @@ import com.drew.imaging.ImageMetadataReader;
 import com.drew.lang.GeoLocation;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.exif.GpsDirectory;
-import com.fasterxml.jackson.databind.deser.std.StringArrayDeserializer;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,7 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.swing.table.TableCellRenderer;
 import java.io.File;
 import java.util.Collection;
 import java.util.List;

oss-sdk/pom.xml

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

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.sdk.model.rest.UploadFilePart;
-import cn.reghao.oss.sdk.model.rest.UploadFileRet;
-import cn.reghao.oss.sdk.model.rest.UploadedPart;
+import cn.reghao.oss.api.rest.UploadFilePart;
+import cn.reghao.oss.api.rest.UploadFileRet;
+import cn.reghao.oss.api.rest.UploadedPart;
 import com.google.gson.reflect.TypeToken;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -2,11 +2,11 @@ package cn.reghao.oss.sdk;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
+import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.oss.sdk.model.OssConsoleConfig;
-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 cn.reghao.oss.api.dto.media.*;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import com.google.gson.reflect.TypeToken;
 
 import java.io.File;

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.sdk.model.rest.UploadFileRet;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import com.google.gson.reflect.TypeToken;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;

oss-sdk/src/test/java/OssConsoleClientTest.java

@@ -1,6 +1,7 @@
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
 import cn.reghao.oss.sdk.model.OssConsoleConfig;
 import cn.reghao.oss.sdk.OssConsoleClient;
+import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.*;
@@ -12,18 +13,18 @@ import java.io.*;
 @Slf4j
 public class OssConsoleClientTest {
     public static void main(String[] args) throws Exception {
-        String consoleUrl = "http://bnt.reghao.cn";
-        String accessKeyId = "ESCKn3Cd";
-        String accessKeySecret = "OL9SIOLoOqUjhMiQMv";
+        String consoleUrl = "http://file.reghao.cn";
+        String accessKeyId = "mDM6n1Hl";
+        String accessKeySecret = "mTAzPhSS80gd0Iv2Fb";
         OssConsoleConfig ossConsoleConfig = new OssConsoleConfig(consoleUrl, accessKeyId, accessKeySecret);
         OssConsoleClient ossConsoleClient = new OssConsoleClient(ossConsoleConfig);
 
-        String filePath = "";
+        String filePath = "/home/reghao/Downloads/夏天的较量又要开始啦#换装.mp4";
         File file = new File(filePath);
-//        int channelCode = 114;
+        int channelCode = 101;
+        UploadFileRet uploadFileRet1 = ossConsoleClient.postObject(file, channelCode);
 //        UploadFileRet uploadFileRet = ossConsoleClient.putObject(file, channelCode);
-        /*UploadFileRet uploadFileRet1 = ossConsoleClient.postObject(file, channelCode);
-        UploadFileRet uploadFileRet2 = ossConsoleClient.postObjectByMultiparts(file, channelCode);*/
+        //UploadFileRet uploadFileRet2 = ossConsoleClient.postObjectByMultiparts(file, channelCode);
 
 //        String objectName = "video/playback/28d0fd95e224499c9f2cf1d98b4551a5.flv";
 //        String localPath  = ossConsoleClient.getObject(objectName);
@@ -31,10 +32,12 @@ public class OssConsoleClientTest {
 //        String sha256sum = "1234567890";
 //        boolean exist = ossConsoleClient.headObject(sha256sum);
 
-        int channelCode = 104;
-        String objectId = "749ede6adf704e57be8c5ef94dd5928a";
+        VideoInfo videoInfo = ossConsoleClient.getVideoInfo(channelCode, uploadFileRet1.getUploadId());
+
+        channelCode = 102;
+        String objectId = uploadFileRet1.getUploadId();
         int loginUser = 2;
-        ImageInfo imageInfo = ossConsoleClient.getImageInfo(channelCode, objectId);
+        //ImageInfo imageInfo = ossConsoleClient.getImageInfo(channelCode, objectId);
         System.out.println();
     }
 }

oss-store/pom.xml

@@ -59,11 +59,6 @@
             <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>

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.sdk.model.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectScope;
 import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.oss.store.db.repository.ObjectRepository;

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

@@ -5,9 +5,9 @@ import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.api.dto.OssPayload;
 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.api.rest.UploadFilePart;
+import cn.reghao.oss.api.rest.UploadFileRet;
+import cn.reghao.oss.api.rest.UploadedPart;
 import cn.reghao.oss.store.service.ConsoleServiceWrapper;
 import cn.reghao.oss.store.service.ObjectMultipartUploadService;
 import cn.reghao.jutil.jdk.result.WebResult;

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

@@ -2,7 +2,7 @@ package cn.reghao.oss.store.controller;
 
 import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.api.util.AuthContext;
-import cn.reghao.oss.sdk.model.rest.UploadFileRet;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import cn.reghao.oss.store.model.vo.ObjectProp;
 import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.service.*;

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.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.oss.store.model.po.FileMeta;
 import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.jutil.jdk.db.BaseMapper;

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.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.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;

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

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

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.sdk.model.rest.UploadFilePart;
+import cn.reghao.oss.api.rest.UploadFilePart;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

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

@@ -3,14 +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.sdk.model.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectScope;
 import cn.reghao.oss.api.dto.*;
 import cn.reghao.oss.api.dto.disk.DiskVolume;
-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.dto.ObjectInfo;
+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.api.util.JwtUtil;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.po.FileMeta;

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.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.store.util.FileType;
 import cn.reghao.jutil.jdk.result.Result;

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

@@ -2,9 +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.sdk.model.rest.UploadFilePart;
-import cn.reghao.oss.sdk.model.rest.UploadFileRet;
-import cn.reghao.oss.sdk.model.rest.UploadedPart;
+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.store.db.repository.FilePartRepository;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.po.FilePart;

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.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.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.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.service.FileStoreService;

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

@@ -2,7 +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.api.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;

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.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.constant.VideoUrlType;
 import org.apache.tika.Tika;
 import org.apache.tika.metadata.Metadata;

oss-store/src/main/resources/mapper/FileMetaMapper.xml

@@ -143,7 +143,7 @@
         from file_meta
         where deleted is false and pid=#{pid}
     </select>
-    <select id="findPidByPage" resultType="cn.reghao.oss.sdk.model.dto.ObjectInfo">
+    <select id="findPidByPage" resultType="cn.reghao.oss.api.dto.ObjectInfo">
         select size,object_name,object_id,file_type,filename,date_format(update_time, '%Y-%m-%d %H:%i:%s') as update_time
         from file_meta
         where deleted is false and pid=#{pid}