store-api 的包名修改为 cn.reghao.oss.storeapi

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

@@ -3,7 +3,10 @@ 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.store.api.dto.media.*;
+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 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.oss.store.api.dto.ObjectInfo;
+import cn.reghao.oss.storeapi.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.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.ServerInfo;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.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.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.StoreNodeDto;
-import cn.reghao.oss.store.api.dto.StoreProperties;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.dto.StoreNodeDto;
+import cn.reghao.oss.storeapi.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/UploadChannelPageController.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.console.app.controller.page;
 
-import cn.reghao.oss.store.api.constant.ObjectScope;
-import cn.reghao.oss.store.api.constant.ObjectType;
+import cn.reghao.oss.storeapi.constant.ObjectScope;
+import cn.reghao.oss.storeapi.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.store.api.dto.StoreDiskDto;
+import cn.reghao.oss.storeapi.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.store.api.dto.StoreNodeDto;
+import cn.reghao.oss.storeapi.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,9 +1,8 @@
 package cn.reghao.oss.console.app.model.vo;
 
-import cn.reghao.oss.console.app.model.po.StoreDisk;
 import cn.reghao.oss.console.app.model.po.StoreNode;
-import cn.reghao.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.StoreInfo;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.dto.StoreInfo;
 import lombok.Getter;
 
 import java.util.List;

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.store.api.constant.ObjectScope;
-import cn.reghao.oss.store.api.constant.ObjectType;
+import cn.reghao.oss.storeapi.constant.ObjectScope;
+import cn.reghao.oss.storeapi.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,11 @@ 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.store.api.dto.media.*;
-import cn.reghao.oss.store.api.iface.MediaService;
+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.oss.storeapi.iface.MediaService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

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

@@ -2,8 +2,8 @@ package cn.reghao.oss.console.app.rpc;
 
 import cn.reghao.oss.console.app.service.StoreNodeService;
 import cn.reghao.oss.console.app.service.UploadChannelService;
-import cn.reghao.oss.store.api.dto.*;
-import cn.reghao.oss.store.api.iface.StoreService;
+import cn.reghao.oss.storeapi.dto.ServerInfo;
+import cn.reghao.oss.storeapi.iface.StoreService;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.console.util.AuthKeyContext;

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.store.api.iface.StoreService;
+import cn.reghao.oss.storeapi.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.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.StoreNodeDto;
-import cn.reghao.oss.store.api.dto.StoreProperties;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.dto.StoreNodeDto;
+import cn.reghao.oss.storeapi.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,11 +12,11 @@ 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.store.api.dto.StoreDiskDto;
-import cn.reghao.oss.store.api.dto.StoreInfo;
-import cn.reghao.oss.store.api.dto.StoreNodeDto;
-import cn.reghao.oss.store.api.dto.StoreProperties;
-import cn.reghao.oss.store.api.iface.StoreService;
+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.dto.StoreProperties;
+import cn.reghao.oss.storeapi.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.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.iface.StoreService;
+import cn.reghao.oss.storeapi.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;
 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.oss.store.api.constant.ChannelAction;
-import cn.reghao.oss.store.api.dto.OssPayload;
+import cn.reghao.oss.storeapi.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;
 import cn.reghao.oss.console.app.model.dto.KeyAuthDto;

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.store.api.dto.OssPayload;
+import cn.reghao.oss.storeapi.dto.OssPayload;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;

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

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

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

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

@@ -3,9 +3,15 @@ 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.OssProperties;
-import cn.reghao.oss.store.api.dto.*;
-import cn.reghao.oss.store.api.dto.media.*;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.dto.ObjectInfo;
+import cn.reghao.oss.storeapi.dto.ServerInfo;
+import cn.reghao.oss.storeapi.dto.StoreProperties;
+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.oss.storeapi.rest.UploadFileRet;
 import com.google.gson.reflect.TypeToken;
 
 import java.io.File;
@@ -19,7 +25,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author reghao

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.store.api.rest.UploadFileRet;
+import cn.reghao.oss.storeapi.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.OssProperties;
-import cn.reghao.oss.store.api.dto.ServerInfo;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
+import cn.reghao.oss.storeapi.dto.ServerInfo;
+import cn.reghao.oss.storeapi.rest.UploadFileRet;
 import cn.reghao.oss.sdk.ObjectMultipartUploadService;
 import cn.reghao.oss.sdk.OssStoreClient;
 import cn.reghao.oss.sdk.OssConsoleClient;

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

@@ -2,10 +2,10 @@ package cn.reghao.oss.store.config;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.oss.sdk.OssConsoleClient;
-import cn.reghao.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.StoreDiskDto;
-import cn.reghao.oss.store.api.dto.StoreNodeDto;
-import cn.reghao.oss.store.api.dto.StoreProperties;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.dto.StoreDiskDto;
+import cn.reghao.oss.storeapi.dto.StoreNodeDto;
+import cn.reghao.oss.storeapi.dto.StoreProperties;
 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.oss.store.api.constant.ChannelAction;
-import cn.reghao.oss.store.api.constant.ObjectScope;
-import cn.reghao.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.ObjectMeta;
+import cn.reghao.oss.storeapi.constant.ChannelAction;
+import cn.reghao.oss.storeapi.constant.ObjectScope;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.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.store.api.dto.OssPayload;
+import cn.reghao.oss.storeapi.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

@@ -1,8 +1,8 @@
 package cn.reghao.oss.store.controller;
 
-import cn.reghao.oss.store.api.rest.*;
 import cn.reghao.oss.store.service.ObjectMultipartUploadService;
 import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.oss.storeapi.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.oss.store.api.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.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.store.api.dto.OssPayload;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
+import cn.reghao.oss.storeapi.dto.OssPayload;
+import cn.reghao.oss.storeapi.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,9 +1,9 @@
 package cn.reghao.oss.store.db.mapper;
 
-import cn.reghao.oss.store.api.dto.DeleteFile;
-import cn.reghao.oss.store.api.dto.FileInfo;
+import cn.reghao.oss.storeapi.dto.DeleteFile;
+import cn.reghao.oss.storeapi.dto.FileInfo;
 import cn.reghao.oss.store.model.po.FileMeta;
-import cn.reghao.oss.store.api.dto.ObjectMeta;
+import cn.reghao.oss.storeapi.dto.ObjectMeta;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.jutil.jdk.db.Page;
 import org.apache.ibatis.annotations.Mapper;

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.store.api.dto.ObjectMeta;
+import cn.reghao.oss.storeapi.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/MutableHttpServletRequest.java

@@ -1,40 +0,0 @@
-package cn.reghao.oss.store.inerceptor;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import java.util.*;
-
-/**
- * @author reghao
- * @date 2022-08-25 21:45:31
- */
-public final class MutableHttpServletRequest extends HttpServletRequestWrapper {
-    private final Map<String, String> customHeaders;
-
-    public MutableHttpServletRequest(HttpServletRequest request) {
-        super(request);
-        this.customHeaders = new HashMap<>();
-    }
-
-    public void putHeader(String name, String value) {
-        customHeaders.put(name, value);
-    }
-
-    public String getHeader(String name) {
-        String value = customHeaders.get(name);
-        if (value != null) {
-            return value;
-        }
-
-        return ((HttpServletRequest) getRequest()).getHeader(name);
-    }
-
-    public Enumeration<String> getHeaderNames() {
-        Set<String> set = new HashSet<>(customHeaders.keySet());
-        Enumeration<String> e = ((HttpServletRequest) getRequest()).getHeaderNames();
-        while (e.hasMoreElements()) {
-            set.add(e.nextElement());
-        }
-        return Collections.enumeration(set);
-    }
-}

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.store.api.dto.OssPayload;
+import cn.reghao.oss.storeapi.dto.OssPayload;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.*;

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

@@ -1,7 +1,10 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.oss.store.api.dto.media.*;
-import cn.reghao.oss.store.api.iface.MediaService;
+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.oss.storeapi.iface.MediaService;
 import cn.reghao.oss.store.task.MediaFileProcessor;
 import cn.reghao.oss.store.util.UserContext;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,11 +1,11 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.oss.store.api.constant.ObjectScope;
-import cn.reghao.oss.store.api.dto.*;
+import cn.reghao.oss.storeapi.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.store.api.iface.ObjectService;
+import cn.reghao.oss.storeapi.dto.ObjectInfo;
+import cn.reghao.oss.storeapi.iface.ObjectService;
 import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import cn.reghao.oss.store.service.SignService;
 import cn.reghao.oss.store.service.StoreLocalService;

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

@@ -1,13 +1,13 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.oss.store.api.constant.ObjectScope;
-import cn.reghao.oss.store.api.dto.*;
+import cn.reghao.oss.storeapi.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.store.api.constant.ChannelAction;
-import cn.reghao.oss.store.api.iface.StoreService;
+import cn.reghao.oss.storeapi.constant.ChannelAction;
+import cn.reghao.oss.storeapi.dto.*;
+import cn.reghao.oss.storeapi.iface.StoreService;
 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.oss.store.api.constant.ObjectType;
-import cn.reghao.oss.store.api.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.constant.ObjectType;
+import cn.reghao.oss.storeapi.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.store.api.dto.ObjectMeta;
+import cn.reghao.oss.storeapi.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.oss.store.api.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.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.store.api.rest.UploadFilePart;
-import cn.reghao.oss.store.api.rest.UploadPrepare;
-import cn.reghao.oss.store.api.rest.UploadPrepareRet;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
+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.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.oss.store.api.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.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.store.api.dto.ObjectMeta;
+import cn.reghao.oss.storeapi.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.oss.store.api.constant.ChannelAction;
-import cn.reghao.oss.store.api.dto.OssPayload;
+import cn.reghao.oss.storeapi.constant.ChannelAction;
+import cn.reghao.oss.storeapi.dto.OssPayload;
 import org.springframework.stereotype.Service;
 
 import java.util.UUID;

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

@@ -1,7 +1,7 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.StoreProperties;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.dto.StoreProperties;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

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.store.api.dto.ObjectMeta;
-import cn.reghao.oss.store.api.dto.media.AudioInfo;
-import cn.reghao.oss.store.api.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.store.api.dto.media.ImageInfo;
-import cn.reghao.oss.store.api.dto.media.VideoInfo;
+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.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.store.api.dto.ObjectMeta;
+import cn.reghao.oss.storeapi.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.store.api.rest.UploadFileRet;
+import cn.reghao.oss.storeapi.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.oss.store.api.constant.ObjectType;
-import cn.reghao.oss.store.api.constant.VideoUrlType;
+import cn.reghao.oss.storeapi.constant.ObjectType;
+import cn.reghao.oss.storeapi.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.store.api.dto.OssPayload;
+import cn.reghao.oss.storeapi.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.store.api.dto.ObjectMeta">
+    <select id="findObjectMeta" resultType="cn.reghao.oss.storeapi.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.store.api.dto.ObjectMeta">
+    <select id="findObjectMetaById" resultType="cn.reghao.oss.storeapi.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
@@ -159,14 +159,14 @@
         from file_meta
         where pid=#{pid}
     </select>
-    <select id="findFileInfoByPage" resultType="cn.reghao.oss.store.api.dto.FileInfo">
+    <select id="findFileInfoByPage" resultType="cn.reghao.oss.storeapi.dto.FileInfo">
         select file_meta.object_id as file_id,file_meta.filename,file_meta.file_type as type,file_meta.size,file_meta.update_time,file_type.icon
         from file_meta
         inner join file_type
         on file_meta.deleted=0 and file_meta.file_type=file_type.id and file_meta.pid=#{pid}
         order by file_type asc
     </select>
-    <select id="findFileInfo1ByPage" resultType="cn.reghao.oss.store.api.dto.FileInfo">
+    <select id="findFileInfo1ByPage" resultType="cn.reghao.oss.storeapi.dto.FileInfo">
         select file_meta.object_id as file_id,file_meta.filename,file_meta.file_type as type,file_meta.size,file_meta.update_time,file_type.icon_large as icon
         from file_meta
         inner join file_type
@@ -179,7 +179,7 @@
         from file_meta
         where deleted=1
     </select>
-    <select id="findDeletedFileByPage" resultType="cn.reghao.oss.store.api.dto.DeleteFile">
+    <select id="findDeletedFileByPage" resultType="cn.reghao.oss.storeapi.dto.DeleteFile">
         select file_meta.object_id as file_id,file_meta.filename,file_meta.file_type as type,file_meta.size,file_meta.update_time,file_type.icon
         from file_meta
         inner join file_type
@@ -187,7 +187,7 @@
         order by file_type asc
     </select>
 
-    <select id="findDirectories" resultType="cn.reghao.oss.store.api.dto.FileInfo">
+    <select id="findDirectories" resultType="cn.reghao.oss.storeapi.dto.FileInfo">
         select file_meta.object_id as file_id,file_meta.filename,file_meta.file_type as type,file_meta.size,file_meta.update_time,file_type.icon
         from file_meta
         inner join file_type
@@ -218,7 +218,7 @@
         from file_meta
         where filename like concat('%',#{keyword},'%')
     </select>
-    <select id="findKeywordByPage" resultType="cn.reghao.oss.store.api.dto.FileInfo">
+    <select id="findKeywordByPage" resultType="cn.reghao.oss.storeapi.dto.FileInfo">
         select file_meta.object_id as file_id,file_meta.filename,file_meta.file_type as type,file_meta.size,file_meta.update_time,file_type.icon
         from file_meta
         inner join file_type

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package cn.reghao.oss.store.api.constant;
+package cn.reghao.oss.storeapi.constant;
 
 import java.util.Set;
 

store-api/src/main/java/cn/reghao/oss/store/api/constant/UploadChannel.java → store-api/src/main/java/cn/reghao/oss/storeapi/constant/UploadChannel.java

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

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

@@ -1,4 +1,4 @@
-package cn.reghao.oss.store.api.constant;
+package cn.reghao.oss.storeapi.constant;
 
 /**
  * 视频 URL 类型

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,10 @@
-package cn.reghao.oss.store.api.iface;
+package cn.reghao.oss.storeapi.iface;
 
-import cn.reghao.oss.store.api.dto.media.*;
+import cn.reghao.oss.storeapi.dto.media.*;
+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 java.util.List;
 

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

@@ -1,6 +1,7 @@
-package cn.reghao.oss.store.api.iface;
+package cn.reghao.oss.storeapi.iface;
 
-import cn.reghao.oss.store.api.dto.*;
+import cn.reghao.oss.storeapi.dto.*;
+import cn.reghao.oss.storeapi.dto.ObjectInfo;
 
 import java.util.List;
 

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

@@ -1,10 +1,8 @@
-package cn.reghao.oss.store.api.iface;
+package cn.reghao.oss.storeapi.iface;
 
-import cn.reghao.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.StoreInfo;
-import cn.reghao.oss.store.api.dto.StoreProperties;
-
-import java.util.List;
+import cn.reghao.oss.storeapi.dto.ObjectChannel;
+import cn.reghao.oss.storeapi.dto.StoreInfo;
+import cn.reghao.oss.storeapi.dto.StoreProperties;
 
 /**
  * @author reghao

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

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

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

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

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

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

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

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

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

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