对应 oss 项目引入产生的依赖变更

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/ChatMessageService.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.app.chat.service;
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.tool.id.SnowFlake;
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.chat.db.mapper.*;
 import cn.reghao.tnb.content.app.chat.model.constant.MsgType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/db/mapper/AudioFileMapper.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.data.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.tnb.content.app.data.model.po.AudioFile;
-import cn.reghao.oss.api.dto.media.AudioInfo;
-import cn.reghao.oss.api.dto.media.AudioUrl;
+import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
+import cn.reghao.tnb.oss.api.dto.media.AudioUrl;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/db/repository/AudioRepository.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.data.db.repository;
 
 import cn.reghao.tnb.content.app.data.db.mapper.AudioFileMapper;
 import cn.reghao.tnb.content.app.data.model.po.AudioFile;
-import cn.reghao.oss.api.dto.media.AudioInfo;
-import cn.reghao.oss.api.dto.media.AudioUrl;
+import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
+import cn.reghao.tnb.oss.api.dto.media.AudioUrl;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/vo/StatusCard.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.data.model.vo;
 
-import cn.reghao.oss.api.dto.media.ImageUrlDto;
+import cn.reghao.tnb.oss.api.dto.media.ImageUrlDto;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import lombok.Data;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/AudioPostService.java

@@ -11,7 +11,7 @@ import cn.reghao.tnb.content.app.data.db.mapper.AudioPostMapper;
 import cn.reghao.tnb.content.app.data.model.dto.AudioScopeUpdate;
 import cn.reghao.tnb.content.app.data.model.po.AudioPost;
 import cn.reghao.tnb.content.app.data.model.vo.UserAudioCard;
-import cn.reghao.oss.api.dto.media.AudioInfo;
+import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/ImagePostService.java

@@ -5,7 +5,7 @@ import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostScope;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/DiskFile.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.disk.model.po;
 
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskFileDetail.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.disk.model.vo;
 
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/FileInfo.java

@@ -1,8 +1,7 @@
 package cn.reghao.tnb.content.app.disk.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.oss.api.constant.ObjectType;
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/CamRecordService.java

@@ -5,7 +5,7 @@ import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
-import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.disk.db.mapper.CamDeviceMapper;
 import cn.reghao.tnb.content.app.disk.db.mapper.CamRecordMapper;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskAlbumService.java

@@ -4,7 +4,7 @@ import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.account.api.dto.AccountAvatar;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskFileService.java

@@ -7,8 +7,8 @@ import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.api.constant.ObjectType;
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.StringUtil;
 import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskFolderService.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.disk.service;
 
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
 import cn.reghao.tnb.content.app.disk.model.dto.CreateFolder;

content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/service/ProductService.java

@@ -5,7 +5,7 @@ import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.tool.json.JsonConverter;
 import cn.reghao.jutil.tool.id.SnowFlake;
-import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.content.api.dto.TaobaoItem;
 import cn.reghao.tnb.content.app.mall.db.mapper.ProductMapper;
@@ -18,13 +18,7 @@ import cn.reghao.tnb.content.app.mall.feign.UserFeignClient;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoPostController.java

@@ -11,7 +11,7 @@ import cn.reghao.tnb.content.app.vod.model.dto.*;
 import cn.reghao.tnb.content.api.dto.UserVideoPost;
 import cn.reghao.tnb.content.app.vod.service.VideoPostQuery;
 import cn.reghao.tnb.content.app.vod.service.VideoPostService;
-import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/VideoFileMapper.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.vod.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.tnb.content.app.vod.model.po.VideoFile;
-import cn.reghao.oss.api.dto.media.VideoInfo;
-import cn.reghao.oss.api.dto.media.VideoUrlDto;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoUrlDto;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/VideoPostMapper.java

@@ -11,7 +11,7 @@ import cn.reghao.tnb.content.app.vod.model.po.BannerVideo;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
 import cn.reghao.tnb.content.app.vod.model.vo.*;
 import cn.reghao.tnb.content.app.vod.model.dto.SearchCriteria;
-import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/repository/VideoRepository.java

@@ -7,8 +7,8 @@ import cn.reghao.tnb.content.app.vod.db.mapper.VideoStatisticMapper;
 import cn.reghao.tnb.content.app.vod.model.po.VideoFile;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
 import cn.reghao.tnb.content.app.vod.model.po.VideoStatistic;
-import cn.reghao.oss.api.dto.media.VideoInfo;
-import cn.reghao.oss.api.dto.media.VideoUrlDto;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoUrlDto;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostItem.java

@@ -1,13 +1,12 @@
 package cn.reghao.tnb.content.app.vod.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 
 /**
  * @author reghao

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoFile.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoPost.java

@@ -2,7 +2,6 @@ package cn.reghao.tnb.content.app.vod.model.po;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.constant.VideoStatus;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/AdminVodService.java

@@ -5,7 +5,7 @@ import cn.reghao.file.api.iface.FileService;
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.tool.json.JsonConverter;
-import cn.reghao.oss.api.dto.media.VideoUrlDto;
+import cn.reghao.tnb.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.dto.*;
 import cn.reghao.tnb.content.app.vod.db.mapper.SiteNoticeMapper;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/CrawledDataService.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.account.api.dto.AccountInfo;
 import cn.reghao.tnb.account.api.dto.CrawledUser;
 import cn.reghao.tnb.account.api.iface.AccountQuery;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoPostQuery.java

@@ -1,9 +1,8 @@
 package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.content.api.dto.*;
-import cn.reghao.tnb.content.app.vod.model.po.BannerVideo;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
 import cn.reghao.tnb.content.app.vod.model.vo.BannerVideoVO;
 import cn.reghao.tnb.content.app.vod.model.vo.VideoDetail;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoService.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.api.dto.media.VideoUrlDto;
+import cn.reghao.tnb.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.vod.db.repository.VideoRepository;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPlayServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.service.impl;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.api.dto.media.VideoUrlDto;
+import cn.reghao.tnb.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.db.PageScroll;
 import cn.reghao.tnb.common.util.ConstantId;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPostQueryImpl.java

@@ -4,8 +4,8 @@ import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.api.dto.media.VideoInfo;
-import cn.reghao.oss.api.dto.media.VideoUrlDto;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.StringUtil;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPostServiceImpl.java

@@ -4,9 +4,9 @@ import cn.reghao.file.api.iface.JobService;
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.tool.id.IdGenerator;
-import cn.reghao.oss.api.dto.media.ImageInfo;
-import cn.reghao.oss.api.dto.media.VideoInfo;
-import cn.reghao.oss.api.dto.media.VideoUrlDto;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.dto.VideoFilePublish;

content/content-service/src/main/resources/mapper/data/AudioFileMapper.xml

@@ -22,13 +22,13 @@
         from audio_file
         where audio_file_id=#{audioFileId}
     </select>
-    <select id="findAudioInfo" resultType="cn.reghao.oss.api.dto.media.AudioInfo">
+    <select id="findAudioInfo" resultType="cn.reghao.tnb.oss.api.dto.media.AudioInfo">
         select audio_file_id,duration,codec,url
         from audio_file
         where audio_file_id=#{audioFileId}
         order by id desc
     </select>
-    <select id="findAudioUrl" resultType="cn.reghao.oss.api.dto.media.AudioUrl">
+    <select id="findAudioUrl" resultType="cn.reghao.tnb.oss.api.dto.media.AudioUrl">
         select audio_file_id,bit_rate,codec,url
         from audio_file
         where audio_file_id=#{audioFileId}

content/content-service/src/main/resources/mapper/vod/VideoFileMapper.xml

@@ -27,7 +27,7 @@
         select *
         from vod_video_file
     </select>
-    <select id="findVideoInfo" resultType="cn.reghao.oss.api.dto.media.VideoInfo">
+    <select id="findVideoInfo" resultType="cn.reghao.tnb.oss.api.dto.media.VideoInfo">
         select object_id,duration,horizontal,quality,video_codec,audio_codec,url_type,url
         from vod_video_file
         where `deleted`=0 and object_id=#{objectId}
@@ -42,7 +42,7 @@
         from vod_video_file
         where `deleted`=0 and object_id=#{objectId}
     </select>
-    <select id="findVideoUrls" resultType="cn.reghao.oss.api.dto.media.VideoUrlDto">
+    <select id="findVideoUrls" resultType="cn.reghao.tnb.oss.api.dto.media.VideoUrlDto">
         select object_id,channel_code,url_type as type,url,width,height,quality
         from vod_video_file
         where `deleted`=0 and video_id=#{videoId}

content/content-service/src/test/java/cn/reghao/tnb/content/app/disk/service/DiskUnitTest.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.disk.service;
 
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.content.app.disk.model.vo.FileTree;
 import org.junit.Test;
 import org.junit.runner.RunWith;

file/file-api/src/main/java/cn/reghao/file/api/constant/UploadChannelType.java

@@ -1,8 +1,8 @@
 package cn.reghao.file.api.constant;
 
-import cn.reghao.oss.api.constant.ObjectSize;
-import cn.reghao.oss.api.constant.ObjectScope;
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.constant.ObjectSize;
+import cn.reghao.tnb.oss.api.constant.ObjectScope;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 
 /**
  * @author reghao

file/file-api/src/main/java/cn/reghao/file/api/iface/OssService.java

@@ -1,11 +1,11 @@
 package cn.reghao.file.api.iface;
 
-import cn.reghao.oss.api.dto.ObjectInfo;
-import cn.reghao.oss.api.dto.ServerInfo;
-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.tnb.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.dto.ServerInfo;
+import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
+import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 
 /**
  * @author reghao

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/FileOssController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.controller;
 
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.tnb.oss.api.dto.ServerInfo;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.file.api.constant.UploadChannelType;
 import cn.reghao.tnb.file.app.rpc.StoreServiceWrapperRouter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/OssSdkController.java

@@ -2,13 +2,13 @@ package cn.reghao.tnb.file.app.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.api.iface.ConsoleService;
-import cn.reghao.oss.api.dto.ObjectInfo;
-import cn.reghao.oss.api.dto.ServerInfo;
-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.tnb.oss.api.iface.ConsoleService;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.dto.ServerInfo;
+import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
+import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.KeyAuthDto;
 import cn.reghao.tnb.file.app.rpc.StoreServiceWrapper;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/StoreObjectController.java

@@ -3,9 +3,9 @@ package cn.reghao.tnb.file.app.controller;
 import cn.reghao.file.api.iface.FileService;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.api.iface.ConsoleService;
-import cn.reghao.oss.api.dto.ObjectInfo;
-import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.tnb.oss.api.iface.ConsoleService;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.dto.ServerInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.po.UserNode;
 import cn.reghao.tnb.file.app.model.vo.FileInfo;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/UploadChannelController.java

@@ -2,9 +2,9 @@ package cn.reghao.tnb.file.app.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.api.constant.ObjectSize;
-import cn.reghao.oss.api.constant.ObjectScope;
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.constant.ObjectSize;
+import cn.reghao.tnb.oss.api.constant.ObjectScope;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.UploadChannelDto;
 import cn.reghao.tnb.common.db.SelectOption;

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/repository/StoreRepository.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.file.app.db.repository;
 
-import cn.reghao.oss.api.dto.StoreNodeDto;
+import cn.reghao.tnb.oss.api.dto.StoreNodeDto;
 import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
 import cn.reghao.tnb.file.app.db.mapper.StoreVolumeMapper;
 import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/task/ConvertTask.java

@@ -1,8 +1,6 @@
 package cn.reghao.tnb.file.app.delay.task;
 
 import cn.reghao.jutil.media.FFmpegWrapper;
-import cn.reghao.oss.api.rest.UploadFileRet;
-import cn.reghao.tnb.content.api.dto.VideoConvertedDto;
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
 import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;
 import cn.reghao.tnb.file.app.model.constant.JobStatus;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/UploadChannelDto.java

@@ -1,9 +1,9 @@
 package cn.reghao.tnb.file.app.model.dto;
 
 import cn.reghao.jutil.web.validator.ValidEnum;
-import cn.reghao.oss.api.constant.ObjectSize;
-import cn.reghao.oss.api.constant.ObjectScope;
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.constant.ObjectSize;
+import cn.reghao.tnb.oss.api.constant.ObjectScope;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/StoreNode.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.api.dto.StoreNodeDto;
+import cn.reghao.tnb.oss.api.dto.StoreNodeDto;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/StoreVolume.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.api.dto.disk.DiskVolume;
+import cn.reghao.tnb.oss.api.dto.disk.DiskVolume;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/vo/FileInfo.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.model.vo;
 
-import cn.reghao.oss.api.constant.ObjectType;
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/ConsoleServiceImpl.java

@@ -1,11 +1,11 @@
 package cn.reghao.tnb.file.app.rpc;
 
-import cn.reghao.oss.api.dto.NodeProperties;
-import cn.reghao.oss.api.dto.ObjectChannel;
-import cn.reghao.oss.api.dto.StoreNodeDto;
-import cn.reghao.oss.api.iface.ConsoleService;
-import cn.reghao.oss.api.iface.StoreService;
-import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.tnb.oss.api.dto.NodeProperties;
+import cn.reghao.tnb.oss.api.dto.ObjectChannel;
+import cn.reghao.tnb.oss.api.dto.StoreNodeDto;
+import cn.reghao.tnb.oss.api.iface.ConsoleService;
+import cn.reghao.tnb.oss.api.iface.StoreService;
+import cn.reghao.tnb.oss.api.dto.ServerInfo;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.model.po.UploadChannel;
 import cn.reghao.tnb.file.app.model.po.UserNode;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/JobServiceImpl.java

@@ -2,7 +2,6 @@ package cn.reghao.tnb.file.app.rpc;
 
 import cn.reghao.file.api.iface.JobService;
 import cn.reghao.jutil.tool.id.SnowFlake;
-import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
 import cn.reghao.tnb.content.api.iface.MallService;
 import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/RpcService.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.file.app.rpc;
 
-import cn.reghao.oss.api.iface.StoreService;
+import cn.reghao.tnb.oss.api.iface.StoreService;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import org.apache.dubbo.config.ApplicationConfig;
 import org.apache.dubbo.config.ConsumerConfig;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/StoreServiceWrapper.java

@@ -1,12 +1,12 @@
 package cn.reghao.tnb.file.app.rpc;
 
-import cn.reghao.oss.api.dto.disk.DiskVolume;
-import cn.reghao.oss.api.iface.StoreService;
-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.tnb.oss.api.dto.disk.DiskVolume;
+import cn.reghao.tnb.oss.api.iface.StoreService;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
+import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.service.UserNodeService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/StoreServiceWrapperRouter.java

@@ -1,14 +1,14 @@
 package cn.reghao.tnb.file.app.rpc;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.api.iface.ConsoleService;
-import cn.reghao.oss.api.constant.ObjectScope;
-import cn.reghao.oss.api.dto.ObjectInfo;
-import cn.reghao.oss.api.dto.ServerInfo;
-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.tnb.oss.api.iface.ConsoleService;
+import cn.reghao.tnb.oss.api.constant.ObjectScope;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.dto.ServerInfo;
+import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
+import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.file.app.db.repository.StoreRepository;
 import cn.reghao.tnb.file.app.model.constant.OssType;
 import cn.reghao.tnb.file.app.model.po.UploadChannel;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/AvatarService.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.service;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.AvatarUpdate;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/OssFileService.java

@@ -3,10 +3,10 @@ package cn.reghao.tnb.file.app.service;
 import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.converter.ByteType;
 import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.oss.api.iface.StoreService;
-import cn.reghao.oss.api.constant.ObjectScope;
-import cn.reghao.oss.api.constant.ObjectType;
-import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.tnb.oss.api.iface.StoreService;
+import cn.reghao.tnb.oss.api.constant.ObjectScope;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.model.po.UserNode;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/StoreNodeService.java

@@ -4,8 +4,8 @@ import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.converter.ByteType;
 import cn.reghao.jutil.jdk.math.Calculator;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.api.dto.StoreNodeDto;
-import cn.reghao.oss.api.dto.disk.DiskVolume;
+import cn.reghao.tnb.oss.api.dto.StoreNodeDto;
+import cn.reghao.tnb.oss.api.dto.disk.DiskVolume;
 import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
 import cn.reghao.tnb.file.app.db.mapper.StoreVolumeMapper;
 import cn.reghao.tnb.file.app.db.mapper.UserNodeMapper;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/UploadChannelService.java

@@ -4,9 +4,9 @@ import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.converter.ByteType;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
-import cn.reghao.oss.api.dto.ObjectChannel;
-import cn.reghao.oss.api.constant.ObjectScope;
-import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.oss.api.dto.ObjectChannel;
+import cn.reghao.tnb.oss.api.constant.ObjectScope;
+import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.common.util.ConstantId;
 import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;
 import cn.reghao.tnb.file.app.db.repository.ChannelRepository;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/UserKeyService.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.file.app.service;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.security.RandomString;
-import cn.reghao.oss.api.constant.ChannelAction;
+import cn.reghao.tnb.oss.api.constant.ChannelAction;
 import cn.reghao.jutil.auth.model.OssPayload;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.jutil.auth.JwtUtil;

file/pom.xml

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