store-api 修改为 oss-api, 为 oss-console 和 oss-store 提供一个统一的接口, 二者按需实现具体的接口

store-api/pom.xml → oss-api/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.reghao.oss</groupId>
-    <artifactId>store-api</artifactId>
+    <artifactId>oss-api</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
     <properties>
@@ -21,11 +21,6 @@
             <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>
@@ -47,4 +42,4 @@
             <url>http://nexus.reghao.cn/repository/maven-local-hosted/</url>
         </repository>
     </distributionManagement>
-</project>
+</project>

oss-api/src/main/java/cn/reghao/oss/api/constant/ChannelAction.java

@@ -0,0 +1,55 @@
+package cn.reghao.oss.api.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);
+    }
+}

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

@@ -0,0 +1,56 @@
+package cn.reghao.oss.api.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);
+    }
+}

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

@@ -0,0 +1,65 @@
+package cn.reghao.oss.api.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);
+    }
+}

oss-api/src/main/java/cn/reghao/oss/api/constant/SupportedMedia.java

@@ -0,0 +1,15 @@
+package cn.reghao.oss.api.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");
+}

oss-api/src/main/java/cn/reghao/oss/api/constant/VideoUrlType.java

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

oss-api/src/main/java/cn/reghao/oss/api/dto/DownloadUrl.java

@@ -0,0 +1,19 @@
+package cn.reghao.oss.api.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;
+}

store-api/src/main/java/cn/reghao/oss/storeapi/dto/NodeProperties.java → oss-api/src/main/java/cn/reghao/oss/api/dto/NodeProperties.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.storeapi.dto;
+package cn.reghao.oss.api.dto;
 
 import java.io.Serializable;
 

oss-api/src/main/java/cn/reghao/oss/api/dto/ObjectChannel.java

@@ -0,0 +1,26 @@
+package cn.reghao.oss.api.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;
+}

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

@@ -0,0 +1,31 @@
+package cn.reghao.oss.api.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;
+    }
+}

store-api/src/main/java/cn/reghao/oss/storeapi/dto/ObjectMeta.java → oss-api/src/main/java/cn/reghao/oss/api/dto/ObjectMeta.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/dto/OssPayload.java → oss-api/src/main/java/cn/reghao/oss/api/dto/OssPayload.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/dto/ServerInfo.java → oss-api/src/main/java/cn/reghao/oss/api/dto/ServerInfo.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/dto/StoreDiskDto.java → oss-api/src/main/java/cn/reghao/oss/api/dto/StoreDiskDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.storeapi.dto;
+package cn.reghao.oss.api.dto;
 
 import cn.reghao.jutil.jdk.store.LocalStore;
 import lombok.Getter;

store-api/src/main/java/cn/reghao/oss/storeapi/dto/StoreInfo.java → oss-api/src/main/java/cn/reghao/oss/api/dto/StoreInfo.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/dto/StoreNodeDto.java → oss-api/src/main/java/cn/reghao/oss/api/dto/StoreNodeDto.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/dto/StoreProperties.java → oss-api/src/main/java/cn/reghao/oss/api/dto/StoreProperties.java

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

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

@@ -0,0 +1,24 @@
+package cn.reghao.oss.api.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;
+}

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

@@ -0,0 +1,21 @@
+package cn.reghao.oss.api.dto.media;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2023-10-12 15:07:44
+ */
+@Setter
+@Getter
+public class AudioUrl implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String audioFileId;
+    private String codec;
+    private Long bitRate;
+    private String url;
+}

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

@@ -0,0 +1,21 @@
+package cn.reghao.oss.api.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;
+}

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

@@ -0,0 +1,24 @@
+package cn.reghao.oss.api.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;
+}

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

@@ -0,0 +1,24 @@
+package cn.reghao.oss.api.dto.media;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2023-08-28 15:50:38
+ */
+@Setter
+@Getter
+public class ImageUrlDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String imageFileId;
+    private String originalUrl;
+    private String thumbnailUrl;
+
+    public ImageUrlDto(String imageFileId) {
+        this.imageFileId = imageFileId;
+    }
+}

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

@@ -0,0 +1,32 @@
+package cn.reghao.oss.api.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;
+}

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

@@ -0,0 +1,22 @@
+package cn.reghao.oss.api.dto.media;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2023-01-10 09:51:53
+ */
+@Getter
+@Setter
+public class VideoUrlDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String type;
+    private String url;
+    private int width;
+    private int height;
+    private String quality;
+}

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

@@ -0,0 +1,9 @@
+package cn.reghao.oss.api.iface;
+
+/**
+ * @author reghao
+ * @date 2024-04-23 10:31:49
+ */
+public interface AliService {
+    String getSignedUrl(String objectName);
+}

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

@@ -0,0 +1,20 @@
+package cn.reghao.oss.api.iface;
+
+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;
+
+/**
+ * @author reghao
+ * @date 2024-04-23 15:14:06
+ */
+public interface MediaService {
+    VideoInfo getVideoInfo(int channelId, String objectId);
+    ImageInfo getImageInfo(int channelId, String objectId);
+    List<ConvertedImageInfo> getWebpInfo(int channelId, List<String> objectIds);
+    AudioInfo getAudioInfo(int channelId, String objectId);
+    String getSignedUrl(int channelId, String objectId);
+}

store-api/src/main/java/cn/reghao/oss/storeapi/iface/NodeService.java → oss-api/src/main/java/cn/reghao/oss/api/iface/NodeService.java

@@ -1,8 +1,8 @@
-package cn.reghao.oss.storeapi.iface;
+package cn.reghao.oss.api.iface;
 
-import cn.reghao.oss.storeapi.dto.NodeProperties;
-import cn.reghao.oss.storeapi.dto.StoreNodeDto;
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.NodeProperties;
+import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.StoreNodeDto;
 
 /**
  * @author reghao

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

@@ -0,0 +1,18 @@
+package cn.reghao.oss.api.iface;
+
+import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.ObjectInfo;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2024-04-23 15:14:06
+ */
+public interface ObjectService {
+    void setObjectsScope(int channelId, List<String> objectIds, int scope);
+    void deleteByObjectIds(int channelId, List<String> objectIds);
+    void deleteByObjectUrl(String objectUrl);
+    ObjectInfo getObjectInfo(int channelId, String objectId);
+    ObjectChannel getObjectChannel(int channelId);
+}

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

@@ -1,7 +1,7 @@
-package cn.reghao.oss.storeapi.iface;
+package cn.reghao.oss.api.iface;
 
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
-import cn.reghao.oss.storeapi.dto.StoreInfo;
+import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.StoreInfo;
 
 /**
  * @author reghao

store-api/src/main/java/cn/reghao/oss/storeapi/rest/UploadFilePart.java → oss-api/src/main/java/cn/reghao/oss/api/rest/UploadFilePart.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/rest/UploadFileRet.java → oss-api/src/main/java/cn/reghao/oss/api/rest/UploadFileRet.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/rest/UploadPrepare.java → oss-api/src/main/java/cn/reghao/oss/api/rest/UploadPrepare.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/rest/UploadPrepareRet.java → oss-api/src/main/java/cn/reghao/oss/api/rest/UploadPrepareRet.java

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

store-api/src/main/java/cn/reghao/oss/storeapi/rest/UploadedPart.java → oss-api/src/main/java/cn/reghao/oss/api/rest/UploadedPart.java

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

oss-console/pom.xml

@@ -141,7 +141,7 @@
 
         <dependency>
             <groupId>cn.reghao.oss</groupId>
-            <artifactId>store-api</artifactId>
+            <artifactId>oss-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>

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.tnb.file.api.dto.media.*;
+import cn.reghao.oss.api.dto.media.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

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.tnb.file.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

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

@@ -3,8 +3,8 @@ 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.tnb.file.api.dto.ObjectChannel;
-import cn.reghao.oss.storeapi.dto.ServerInfo;
+import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.oss.console.app.rpc.OssService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -2,9 +2,9 @@ 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.tnb.file.api.dto.ObjectChannel;
-import cn.reghao.oss.storeapi.dto.StoreNodeDto;
-import cn.reghao.oss.storeapi.dto.StoreProperties;
+import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.StoreNodeDto;
+import cn.reghao.oss.api.dto.StoreProperties;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreObjectPageController.java

@@ -6,7 +6,7 @@ import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.rpc.OssService;
 import cn.reghao.oss.console.util.DefaultSetting;
 import cn.reghao.oss.console.util.db.PageSort;
-import cn.reghao.oss.storeapi.dto.ServerInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;

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.tnb.file.api.constant.ObjectScope;
-import cn.reghao.tnb.file.api.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.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;

oss-console/src/main/java/cn/reghao/oss/console/app/model/po/StoreDisk.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.console.app.model.po;
 
-import cn.reghao.oss.storeapi.dto.StoreDiskDto;
+import cn.reghao.oss.api.dto.StoreDiskDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

oss-console/src/main/java/cn/reghao/oss/console/app/model/po/StoreNode.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.model.po;
 
 import cn.reghao.oss.console.util.db.BaseEntity;
-import cn.reghao.oss.storeapi.dto.StoreNodeDto;
+import cn.reghao.oss.api.dto.StoreNodeDto;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

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

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

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.tnb.file.api.constant.ObjectScope;
-import cn.reghao.tnb.file.api.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import lombok.Getter;
 

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.tnb.file.api.dto.media.*;
-import cn.reghao.tnb.file.api.iface.MediaService;
+import cn.reghao.oss.api.dto.media.*;
+import cn.reghao.oss.api.iface.MediaService;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;

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.tnb.file.api.dto.ObjectInfo;
-import cn.reghao.tnb.file.api.iface.ObjectService;
+import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.api.iface.ObjectService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/OssService.java

@@ -4,10 +4,10 @@ import cn.reghao.oss.console.app.model.po.UserNode;
 import cn.reghao.oss.console.app.service.UploadChannelService;
 import cn.reghao.oss.console.app.service.UserNodeService;
 import cn.reghao.oss.console.util.JwtUtil;
-import cn.reghao.oss.storeapi.dto.OssPayload;
-import cn.reghao.oss.storeapi.dto.ServerInfo;
+import cn.reghao.oss.api.dto.OssPayload;
+import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
-import cn.reghao.tnb.file.api.constant.ChannelAction;
+import cn.reghao.oss.api.constant.ChannelAction;
 import org.springframework.stereotype.Service;
 
 /**

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/RpcService.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.rpc;
 
 import cn.reghao.oss.console.app.model.po.StoreNode;
-import cn.reghao.oss.storeapi.iface.StoreService;
+import cn.reghao.oss.api.iface.StoreService;
 import org.springframework.stereotype.Service;
 
 /**

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

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

oss-console/src/main/java/cn/reghao/oss/console/app/service/StoreNodeService.java

@@ -12,10 +12,10 @@ import cn.reghao.oss.console.app.model.vo.KeyValue;
 import cn.reghao.oss.console.app.model.vo.StoreDiskVO;
 import cn.reghao.oss.console.app.model.vo.StoreNodeVO;
 import cn.reghao.oss.console.app.rpc.RpcService;
-import cn.reghao.oss.storeapi.dto.StoreDiskDto;
-import cn.reghao.oss.storeapi.dto.StoreInfo;
-import cn.reghao.oss.storeapi.dto.StoreNodeDto;
-import cn.reghao.oss.storeapi.iface.StoreService;
+import cn.reghao.oss.api.dto.StoreDiskDto;
+import cn.reghao.oss.api.dto.StoreInfo;
+import cn.reghao.oss.api.dto.StoreNodeDto;
+import cn.reghao.oss.api.iface.StoreService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;

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

@@ -6,8 +6,8 @@ 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.iface.StoreService;
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.oss.api.iface.StoreService;
+import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.db.repository.UploadChannelRepository;
 import cn.reghao.oss.console.app.model.dto.ChannelScopeDto;

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

@@ -3,8 +3,8 @@ 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.tnb.file.api.constant.ChannelAction;
-import cn.reghao.oss.storeapi.dto.OssPayload;
+import cn.reghao.oss.api.constant.ChannelAction;
+import cn.reghao.oss.api.dto.OssPayload;
 import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.db.repository.UserKeyRepository;
 import cn.reghao.oss.console.app.model.dto.KeyAuthDto;

oss-console/src/main/java/cn/reghao/oss/console/rpc/NodeServiceImpl.java

@@ -7,10 +7,10 @@ import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.console.app.model.po.UserNode;
 import cn.reghao.oss.console.app.service.StoreNodeService;
 import cn.reghao.oss.console.app.service.UploadChannelService;
-import cn.reghao.oss.storeapi.dto.NodeProperties;
-import cn.reghao.oss.storeapi.iface.NodeService;
-import cn.reghao.oss.storeapi.dto.StoreNodeDto;
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.NodeProperties;
+import cn.reghao.oss.api.iface.NodeService;
+import cn.reghao.oss.api.dto.StoreNodeDto;
+import cn.reghao.oss.api.dto.ObjectChannel;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;

oss-console/src/main/java/cn/reghao/oss/console/util/JwtUtil.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.console.util;
 
-import cn.reghao.oss.storeapi.dto.OssPayload;
+import cn.reghao.oss.api.dto.OssPayload;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;

oss-sdk/pom.xml

@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>cn.reghao.oss</groupId>
-            <artifactId>store-api</artifactId>
+            <artifactId>oss-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 

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

@@ -8,10 +8,10 @@ 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.storeapi.rest.UploadFilePart;
-import cn.reghao.oss.storeapi.rest.UploadFileRet;
-import cn.reghao.oss.storeapi.rest.UploadPrepareRet;
-import cn.reghao.oss.storeapi.rest.UploadedPart;
+import cn.reghao.oss.api.rest.UploadFilePart;
+import cn.reghao.oss.api.rest.UploadFileRet;
+import cn.reghao.oss.api.rest.UploadPrepareRet;
+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

@@ -3,12 +3,12 @@ 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.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.tnb.file.api.dto.media.*;
-import cn.reghao.oss.storeapi.rest.UploadFileRet;
+import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.oss.api.dto.StoreProperties;
+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.storeapi.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,6 @@
 import cn.reghao.oss.sdk.model.OssConsoleConfig;
-import cn.reghao.oss.storeapi.dto.ServerInfo;
-import cn.reghao.oss.storeapi.rest.UploadFileRet;
+import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import cn.reghao.oss.sdk.ObjectMultipartUploadService;
 import cn.reghao.oss.sdk.OssStoreClient;
 import cn.reghao.oss.sdk.OssConsoleClient;

oss-store/pom.xml

@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>cn.reghao.oss</groupId>
-            <artifactId>store-api</artifactId>
+            <artifactId>oss-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 

oss-store/src/main/java/cn/reghao/oss/store/config/BeansConfig.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.config;
 
-import cn.reghao.oss.storeapi.iface.NodeService;
+import cn.reghao.oss.api.iface.NodeService;
 import cn.reghao.oss.store.config.props.OssProperties;
 import cn.reghao.oss.store.rpc.RemoteService;
 import org.springframework.context.annotation.Bean;

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

@@ -1,8 +1,8 @@
 package cn.reghao.oss.store.config;
 
 import cn.reghao.oss.store.config.props.DubboProperties;
-import cn.reghao.oss.storeapi.dto.StoreDiskDto;
-import cn.reghao.oss.storeapi.dto.StoreNodeDto;
+import cn.reghao.oss.api.dto.StoreDiskDto;
+import cn.reghao.oss.api.dto.StoreNodeDto;
 import cn.reghao.oss.store.config.props.SpringProperties;
 import cn.reghao.oss.store.service.FileStoreService;
 import cn.reghao.oss.store.service.StoreLocalService;

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

@@ -1,16 +1,16 @@
 package cn.reghao.oss.store.controller;
 
-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.api.constant.ChannelAction;
+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;
 import cn.reghao.oss.store.service.GetObjectService;
 import cn.reghao.oss.store.service.StoreLocalService;
 import cn.reghao.oss.store.util.JwtUtil;
 import cn.reghao.oss.store.util.ObjectUtil;
 import cn.reghao.oss.store.util.SignatureUtil;
-import cn.reghao.oss.storeapi.dto.OssPayload;
+import cn.reghao.oss.api.dto.OssPayload;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

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

@@ -2,7 +2,7 @@ package cn.reghao.oss.store.controller;
 
 import cn.reghao.oss.store.service.ObjectMultipartUploadService;
 import cn.reghao.jutil.jdk.result.WebResult;
-import cn.reghao.oss.storeapi.rest.*;
+import cn.reghao.oss.api.rest.*;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

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.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.oss.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.*;
@@ -9,8 +9,8 @@ import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.oss.storeapi.dto.OssPayload;
-import cn.reghao.oss.storeapi.rest.UploadFileRet;
+import cn.reghao.oss.api.dto.OssPayload;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import cn.reghao.oss.store.util.UserContext;
 import org.apache.commons.io.FileUtils;
 import org.springframework.http.HttpStatus;

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.oss.store.model.po.FileMeta;
-import cn.reghao.oss.storeapi.dto.ObjectMeta;
+import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

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

@@ -4,7 +4,7 @@ import cn.reghao.oss.store.db.mapper.DataBlockMapper;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import cn.reghao.oss.store.model.po.DataBlock;
 import cn.reghao.oss.store.model.po.FileMeta;
-import cn.reghao.oss.storeapi.dto.ObjectMeta;
+import cn.reghao.oss.api.dto.ObjectMeta;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.cache.annotation.CacheEvict;

oss-store/src/main/java/cn/reghao/oss/store/inerceptor/TokenFilter.java

@@ -4,7 +4,7 @@ import cn.reghao.oss.store.service.StoreLocalService;
 import cn.reghao.oss.store.util.JwtUtil;
 import cn.reghao.oss.store.util.UserContext;
 import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.oss.storeapi.dto.OssPayload;
+import cn.reghao.oss.api.dto.OssPayload;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.*;

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

@@ -4,9 +4,9 @@ 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.api.dto.media.*;
 import cn.reghao.oss.store.task.MediaFileProcessor;
-import cn.reghao.tnb.file.api.iface.MediaService;
+import cn.reghao.oss.api.iface.MediaService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;

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

@@ -1,14 +1,14 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.tnb.file.api.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectScope;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.po.FileMeta;
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
-import cn.reghao.tnb.file.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ObjectChannel;
+import cn.reghao.oss.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 cn.reghao.oss.api.iface.ObjectService;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 

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

@@ -1,12 +1,12 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.tnb.file.api.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectScope;
 import cn.reghao.oss.store.service.FileStoreService;
 import cn.reghao.oss.store.service.ObjectNameService;
-import cn.reghao.oss.storeapi.dto.StoreDiskDto;
-import cn.reghao.oss.storeapi.dto.StoreInfo;
-import cn.reghao.oss.storeapi.iface.StoreService;
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.StoreDiskDto;
+import cn.reghao.oss.api.dto.StoreInfo;
+import cn.reghao.oss.api.iface.StoreService;
+import cn.reghao.oss.api.dto.ObjectChannel;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 

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.tnb.file.api.constant.ObjectType;
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
+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;
 import lombok.extern.slf4j.Slf4j;

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

@@ -3,7 +3,7 @@ package cn.reghao.oss.store.service;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import cn.reghao.oss.store.model.dto.ContentRange;
 import cn.reghao.oss.store.model.po.FileMeta;
-import cn.reghao.oss.storeapi.dto.ObjectMeta;
+import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.jutil.web.ServletUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -1,14 +1,14 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.oss.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;
 import cn.reghao.oss.store.util.StringUtil;
-import cn.reghao.oss.storeapi.rest.UploadFilePart;
-import cn.reghao.oss.storeapi.rest.UploadPrepare;
-import cn.reghao.oss.storeapi.rest.UploadPrepareRet;
-import cn.reghao.oss.storeapi.rest.UploadFileRet;
+import cn.reghao.oss.api.rest.UploadFilePart;
+import cn.reghao.oss.api.rest.UploadPrepare;
+import cn.reghao.oss.api.rest.UploadPrepareRet;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.oss.store.model.po.FileMeta;
 import lombok.extern.slf4j.Slf4j;

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.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.oss.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;

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

@@ -9,7 +9,7 @@ import cn.reghao.oss.store.model.vo.ObjectProp;
 import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.util.FileType;
 import cn.reghao.oss.store.util.StringUtil;
-import cn.reghao.oss.storeapi.dto.ObjectMeta;
+import cn.reghao.oss.api.dto.ObjectMeta;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.stereotype.Service;

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

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

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

@@ -1,11 +1,11 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.storeapi.dto.NodeProperties;
-import cn.reghao.oss.storeapi.iface.NodeService;
+import cn.reghao.oss.api.dto.NodeProperties;
+import cn.reghao.oss.api.iface.NodeService;
 import cn.reghao.oss.store.util.UserContext;
 import cn.reghao.oss.store.config.props.OssProperties;
-import cn.reghao.oss.storeapi.dto.StoreNodeDto;
-import cn.reghao.tnb.file.api.dto.ObjectChannel;
+import cn.reghao.oss.api.dto.StoreNodeDto;
+import cn.reghao.oss.api.dto.ObjectChannel;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -7,11 +7,11 @@ import cn.reghao.jutil.media.MediaResolution;
 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.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.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.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

@@ -1,7 +1,7 @@
 package cn.reghao.oss.store.task;
 
 import cn.reghao.jutil.jdk.security.DigestUtil;
-import cn.reghao.oss.storeapi.dto.ObjectMeta;
+import cn.reghao.oss.api.dto.ObjectMeta;
 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 +15,7 @@ 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.storeapi.rest.UploadFileRet;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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.tnb.file.api.constant.ObjectType;
-import cn.reghao.tnb.file.api.constant.VideoUrlType;
+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/java/cn/reghao/oss/store/util/JwtUtil.java

@@ -1,6 +1,6 @@
 package cn.reghao.oss.store.util;
 
-import cn.reghao.oss.storeapi.dto.OssPayload;
+import cn.reghao.oss.api.dto.OssPayload;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;

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

@@ -117,7 +117,7 @@
         from file_meta
         where content_id=#{contentId}
     </select>
-    <select id="findObjectMeta" resultType="cn.reghao.oss.storeapi.dto.ObjectMeta">
+    <select id="findObjectMeta" resultType="cn.reghao.oss.api.dto.ObjectMeta">
         select file_meta.size,file_meta.content_type,file_meta.object_name,file_meta.object_id,file_meta.scope as scope,file_meta.upload_by,
         data_block.absolute_path
         from file_meta
@@ -125,7 +125,7 @@
         on file_meta.content_id=data_block.content_id
         and file_meta.object_name=#{objectName}
     </select>
-    <select id="findObjectMetaById" resultType="cn.reghao.oss.storeapi.dto.ObjectMeta">
+    <select id="findObjectMetaById" resultType="cn.reghao.oss.api.dto.ObjectMeta">
         select file_meta.size,file_meta.content_type,file_meta.object_name,file_meta.object_id,file_meta.scope as scope,file_meta.upload_by,
         data_block.absolute_path
         from file_meta