1.将 cn.reghao.dfs 包名修改为 cn.reghao.oss

2.将 dfs-store 修改为 oss-store

dfs-store/Dockerfile → oss-store/Dockerfile

@@ -2,6 +2,6 @@ FROM adoptopenjdk/openjdk11:x86_64-alpine-jre-11.0.15_10
 
 WORKDIR /app
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
-COPY target/dfs-store.jar /app/dfs-store.jar
+COPY target/oss-store.jar /app/oss-store.jar
 
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app/dfs-store.jar"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app/oss-store.jar"]

dfs-store/README.md → oss-store/README.md

@@ -1,4 +1,4 @@
-# dfs-store
+# oss-store
 一个文件存储系统, 提供文件的存储, 访问和删除等服务, 不支持文件修改.
 
 ## 依赖的第三方服务

dfs-store/bin/shutdown.sh → oss-store/bin/shutdown.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-app='dfs-store.jar'
+app='oss-store.jar'
 pid=`jps | grep ${app} | awk '{print $1}'`
 kill -15 ${pid}

dfs-store/bin/start.sh → oss-store/bin/start.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-app='dfs-store.jar'
+app='oss-store.jar'
 app_path=`pwd`/${app}
 nohup java -jar ${app_path} > console.log 2>&1 &

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

@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>cn.reghao.dfs</groupId>
-    <artifactId>dfs-store</artifactId>
+    <groupId>cn.reghao.oss</groupId>
+    <artifactId>oss-store</artifactId>
     <version>1.0.0</version>
 
     <properties>
@@ -177,7 +177,7 @@
     </profiles>
 
     <build>
-        <finalName>dfs-store</finalName>
+        <finalName>oss-store</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

dfs-store/src/main/java/cn/reghao/dfs/store/DfsStoreApplication.java → oss-store/src/main/java/cn/reghao/oss/store/OssStoreApplication.java

@@ -1,11 +1,11 @@
-package cn.reghao.dfs.store;
+package cn.reghao.oss.store;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class DfsStoreApplication {
+public class OssStoreApplication {
     public static void main(String[] args) {
-        SpringApplication.run(DfsStoreApplication.class, args);
+        SpringApplication.run(OssStoreApplication.class, args);
     }
 }

dfs-store/src/main/java/cn/reghao/dfs/store/config/CacheConfig.java → oss-store/src/main/java/cn/reghao/oss/store/config/CacheConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.config;
+package cn.reghao.oss.store.config;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import org.springframework.cache.CacheManager;

dfs-store/src/main/java/cn/reghao/dfs/store/config/OssProperties.java → oss-store/src/main/java/cn/reghao/oss/store/config/OssProperties.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.config;
+package cn.reghao.oss.store.config;
 
 import lombok.Getter;
 import lombok.Setter;

dfs-store/src/main/java/cn/reghao/dfs/store/config/mysql/DataSourceConfig.java → oss-store/src/main/java/cn/reghao/oss/store/config/mysql/DataSourceConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.config.mysql;
+package cn.reghao.oss.store.config.mysql;
 
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;

dfs-store/src/main/java/cn/reghao/dfs/store/config/mysql/PageListInterceptor.java → oss-store/src/main/java/cn/reghao/oss/store/config/mysql/PageListInterceptor.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.config.mysql;
+package cn.reghao.oss.store.config.mysql;
 
 import cn.reghao.jutil.jdk.db.Page;
 import org.apache.ibatis.binding.MapperMethod;

dfs-store/src/main/java/cn/reghao/dfs/store/config/spring/FileLifecycle.java → oss-store/src/main/java/cn/reghao/oss/store/config/spring/FileLifecycle.java

@@ -1,8 +1,8 @@
-package cn.reghao.dfs.store.config.spring;
+package cn.reghao.oss.store.config.spring;
 
-import cn.reghao.dfs.store.config.OssProperties;
-import cn.reghao.dfs.store.task.FileTask;
-import cn.reghao.dfs.store.util.store.LocalStores;
+import cn.reghao.oss.store.config.OssProperties;
+import cn.reghao.oss.store.task.FileTask;
+import cn.reghao.oss.store.util.store.LocalStores;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.ApplicationArguments;

dfs-store/src/main/java/cn/reghao/dfs/store/config/web/PutMessageConverter.java → oss-store/src/main/java/cn/reghao/oss/store/config/web/PutMessageConverter.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.config.web;
+package cn.reghao.oss.store.config.web;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpInputMessage;

dfs-store/src/main/java/cn/reghao/dfs/store/config/web/WebConfig.java → oss-store/src/main/java/cn/reghao/oss/store/config/web/WebConfig.java

@@ -1,7 +1,7 @@
-package cn.reghao.dfs.store.config.web;
+package cn.reghao.oss.store.config.web;
 
-import cn.reghao.dfs.store.inerceptor.AccessLogInterceptor;
-import cn.reghao.dfs.store.inerceptor.TokenFilter;
+import cn.reghao.oss.store.inerceptor.AccessLogInterceptor;
+import cn.reghao.oss.store.inerceptor.TokenFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -1,9 +1,9 @@
-package cn.reghao.dfs.store.controller;
+package cn.reghao.oss.store.controller;
 
-import cn.reghao.dfs.store.service.GetObjectService;
-import cn.reghao.dfs.store.util.JwtUtil;
-import cn.reghao.dfs.store.util.ObjectUtil;
-import cn.reghao.dfs.store.util.SignatureUtil;
+import cn.reghao.oss.store.service.GetObjectService;
+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.api.constant.UploadChannel;
 import cn.reghao.oss.api.dto.OssPayload;
 import com.github.benmanes.caffeine.cache.Cache;

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

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.controller;
+package cn.reghao.oss.store.controller;
 
-import cn.reghao.dfs.store.service.ObjectMultipartUploadService;
+import cn.reghao.oss.store.service.ObjectMultipartUploadService;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.api.rest.*;
 import org.springframework.http.MediaType;

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

@@ -1,13 +1,13 @@
-package cn.reghao.dfs.store.controller;
+package cn.reghao.oss.store.controller;
 
-import cn.reghao.dfs.store.model.vo.ObjectProp;
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.service.ChannelValidateService;
-import cn.reghao.dfs.store.service.FileStoreService;
-import cn.reghao.dfs.store.service.ObjectNameService;
-import cn.reghao.dfs.store.service.PutObjectService;
-import cn.reghao.dfs.store.task.FileProcessor;
-import cn.reghao.dfs.store.util.JwtUtil;
+import cn.reghao.oss.store.model.vo.ObjectProp;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.service.ChannelValidateService;
+import cn.reghao.oss.store.service.FileStoreService;
+import cn.reghao.oss.store.service.ObjectNameService;
+import cn.reghao.oss.store.service.PutObjectService;
+import cn.reghao.oss.store.task.FileProcessor;
+import cn.reghao.oss.store.util.JwtUtil;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.security.DigestUtil;

dfs-store/src/main/java/cn/reghao/dfs/store/db/mapper/AudioFileMapper.java → oss-store/src/main/java/cn/reghao/oss/store/db/mapper/AudioFileMapper.java

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.db.mapper;
+package cn.reghao.oss.store.db.mapper;
 
-import cn.reghao.dfs.store.model.po.AudioFile;
+import cn.reghao.oss.store.model.po.AudioFile;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.oss.api.dto.media.AudioInfo;
 import cn.reghao.oss.api.dto.media.AudioUrl;

dfs-store/src/main/java/cn/reghao/dfs/store/db/mapper/DataBlockMapper.java → oss-store/src/main/java/cn/reghao/oss/store/db/mapper/DataBlockMapper.java

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.db.mapper;
+package cn.reghao.oss.store.db.mapper;
 
-import cn.reghao.dfs.store.model.po.DataBlock;
+import cn.reghao.oss.store.model.po.DataBlock;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

dfs-store/src/main/java/cn/reghao/dfs/store/db/mapper/FileMetaMapper.java → oss-store/src/main/java/cn/reghao/oss/store/db/mapper/FileMetaMapper.java

@@ -1,8 +1,8 @@
-package cn.reghao.dfs.store.db.mapper;
+package cn.reghao.oss.store.db.mapper;
 
 import cn.reghao.oss.api.dto.DeleteFile;
 import cn.reghao.oss.api.dto.FileInfo;
-import cn.reghao.dfs.store.model.po.FileMeta;
+import cn.reghao.oss.store.model.po.FileMeta;
 import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.jutil.jdk.db.Page;

dfs-store/src/main/java/cn/reghao/dfs/store/db/mapper/FileTypeMapper.java → oss-store/src/main/java/cn/reghao/oss/store/db/mapper/FileTypeMapper.java

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.db.mapper;
+package cn.reghao.oss.store.db.mapper;
 
-import cn.reghao.dfs.store.model.po.FileType;
+import cn.reghao.oss.store.model.po.FileType;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dfs-store/src/main/java/cn/reghao/dfs/store/db/mapper/ImageFileMapper.java → oss-store/src/main/java/cn/reghao/oss/store/db/mapper/ImageFileMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.dfs.store.db.mapper;
+package cn.reghao.oss.store.db.mapper;
 
-import cn.reghao.dfs.store.model.po.ImageFile;
-import cn.reghao.dfs.store.model.vo.ImageObject;
+import cn.reghao.oss.store.model.po.ImageFile;
+import cn.reghao.oss.store.model.vo.ImageObject;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dfs-store/src/main/java/cn/reghao/dfs/store/db/mapper/VideoFileMapper.java → oss-store/src/main/java/cn/reghao/oss/store/db/mapper/VideoFileMapper.java

@@ -1,8 +1,7 @@
-package cn.reghao.dfs.store.db.mapper;
+package cn.reghao.oss.store.db.mapper;
 
-import cn.reghao.dfs.store.model.po.VideoFile;
+import cn.reghao.oss.store.model.po.VideoFile;
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.oss.api.dto.media.VideoUrlDto;
 import org.apache.ibatis.annotations.Mapper;

dfs-store/src/main/java/cn/reghao/dfs/store/db/repository/AudioRepository.java → oss-store/src/main/java/cn/reghao/oss/store/db/repository/AudioRepository.java

@@ -1,9 +1,11 @@
-package cn.reghao.dfs.store.db.repository;
+package cn.reghao.oss.store.db.repository;
 
-import cn.reghao.dfs.store.db.mapper.*;
-import cn.reghao.dfs.store.model.po.*;
+import cn.reghao.oss.store.db.mapper.*;
+import cn.reghao.oss.store.model.po.*;
 import cn.reghao.oss.api.dto.media.AudioInfo;
 import cn.reghao.oss.api.dto.media.AudioUrl;
+import cn.reghao.oss.store.db.mapper.AudioFileMapper;
+import cn.reghao.oss.store.model.po.AudioFile;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

dfs-store/src/main/java/cn/reghao/dfs/store/db/repository/ImageRepository.java → oss-store/src/main/java/cn/reghao/oss/store/db/repository/ImageRepository.java

@@ -1,13 +1,15 @@
-package cn.reghao.dfs.store.db.repository;
+package cn.reghao.oss.store.db.repository;
 
-import cn.reghao.dfs.store.db.mapper.*;
-import cn.reghao.dfs.store.model.po.*;
+import cn.reghao.oss.store.db.mapper.*;
+import cn.reghao.oss.store.model.po.*;
 import cn.reghao.oss.api.dto.media.ImageUrlDto;
+import cn.reghao.oss.store.db.mapper.ImageFileMapper;
+import cn.reghao.oss.store.model.po.FileMeta;
+import cn.reghao.oss.store.model.po.ImageFile;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

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

@@ -1,9 +1,9 @@
-package cn.reghao.dfs.store.db.repository;
+package cn.reghao.oss.store.db.repository;
 
-import cn.reghao.dfs.store.db.mapper.DataBlockMapper;
-import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
-import cn.reghao.dfs.store.model.po.DataBlock;
-import cn.reghao.dfs.store.model.po.FileMeta;
+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.api.dto.ObjectMeta;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;

dfs-store/src/main/java/cn/reghao/dfs/store/db/repository/VideoRepository.java → oss-store/src/main/java/cn/reghao/oss/store/db/repository/VideoRepository.java

@@ -1,10 +1,11 @@
-package cn.reghao.dfs.store.db.repository;
+package cn.reghao.oss.store.db.repository;
 
-import cn.reghao.dfs.store.db.mapper.*;
-import cn.reghao.dfs.store.model.po.*;
+import cn.reghao.oss.store.db.mapper.*;
+import cn.reghao.oss.store.model.po.*;
 import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.oss.api.dto.media.VideoUrlDto;
-import org.springframework.cache.annotation.Cacheable;
+import cn.reghao.oss.store.db.mapper.VideoFileMapper;
+import cn.reghao.oss.store.model.po.VideoFile;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 

dfs-store/src/main/java/cn/reghao/dfs/store/exception/ControllerExceptionHandler.java → oss-store/src/main/java/cn/reghao/oss/store/exception/ControllerExceptionHandler.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.exception;
+package cn.reghao.oss.store.exception;
 
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
 import cn.reghao.jutil.jdk.result.WebResult;

dfs-store/src/main/java/cn/reghao/dfs/store/exception/FilterExceptionHandler.java → oss-store/src/main/java/cn/reghao/oss/store/exception/FilterExceptionHandler.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.exception;
+package cn.reghao.oss.store.exception;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import org.springframework.boot.autoconfigure.web.ErrorProperties;

dfs-store/src/main/java/cn/reghao/dfs/store/inerceptor/AccessLogInterceptor.java → oss-store/src/main/java/cn/reghao/oss/store/inerceptor/AccessLogInterceptor.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.inerceptor;
+package cn.reghao.oss.store.inerceptor;
 
 import cn.reghao.jutil.web.ServletUtil;
 import lombok.extern.slf4j.Slf4j;

dfs-store/src/main/java/cn/reghao/dfs/store/inerceptor/MutableHttpServletRequest.java → oss-store/src/main/java/cn/reghao/oss/store/inerceptor/MutableHttpServletRequest.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.inerceptor;
+package cn.reghao.oss.store.inerceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;

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

@@ -1,7 +1,7 @@
-package cn.reghao.dfs.store.inerceptor;
+package cn.reghao.oss.store.inerceptor;
 
-import cn.reghao.dfs.store.util.JwtUtil;
-import cn.reghao.dfs.store.util.UserContext;
+import cn.reghao.oss.store.util.JwtUtil;
+import cn.reghao.oss.store.util.UserContext;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.oss.api.dto.OssPayload;
 import org.springframework.stereotype.Component;

dfs-store/src/main/java/cn/reghao/dfs/store/model/dto/ContentRange.java → oss-store/src/main/java/cn/reghao/oss/store/model/dto/ContentRange.java

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

dfs-store/src/main/java/cn/reghao/dfs/store/model/dto/PathUrl.java → oss-store/src/main/java/cn/reghao/oss/store/model/dto/PathUrl.java

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

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/AudioFile.java → oss-store/src/main/java/cn/reghao/oss/store/model/po/AudioFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.po;
+package cn.reghao.oss.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.AllArgsConstructor;
@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.nio.charset.StandardCharsets;
-
 /**
  * 音频文件
  *

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/DataBlock.java → oss-store/src/main/java/cn/reghao/oss/store/model/po/DataBlock.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.po;
+package cn.reghao.oss.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.AllArgsConstructor;

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/FileMeta.java → oss-store/src/main/java/cn/reghao/oss/store/model/po/FileMeta.java

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.model.po;
+package cn.reghao.oss.store.model.po;
 
-import cn.reghao.dfs.store.util.UserContext;
+import cn.reghao.oss.store.util.UserContext;
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/FileType.java → oss-store/src/main/java/cn/reghao/oss/store/model/po/FileType.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.po;
+package cn.reghao.oss.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.AllArgsConstructor;

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/ImageFile.java → oss-store/src/main/java/cn/reghao/oss/store/model/po/ImageFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.po;
+package cn.reghao.oss.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Data;

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/VideoFile.java → oss-store/src/main/java/cn/reghao/oss/store/model/po/VideoFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.po;
+package cn.reghao.oss.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;

dfs-store/src/main/java/cn/reghao/dfs/store/model/vo/ImageObject.java → oss-store/src/main/java/cn/reghao/oss/store/model/vo/ImageObject.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.vo;
+package cn.reghao.oss.store.model.vo;
 
 import lombok.Getter;
 

dfs-store/src/main/java/cn/reghao/dfs/store/model/vo/ObjectProp.java → oss-store/src/main/java/cn/reghao/oss/store/model/vo/ObjectProp.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.vo;
+package cn.reghao.oss.store.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

dfs-store/src/main/java/cn/reghao/dfs/store/model/vo/ObjectResult.java → oss-store/src/main/java/cn/reghao/oss/store/model/vo/ObjectResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.vo;
+package cn.reghao.oss.store.model.vo;
 
 import lombok.Getter;
 import lombok.Setter;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/ChannelServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/ChannelServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.rpc;
+package cn.reghao.oss.store.rpc;
 
 import cn.reghao.oss.api.constant.UploadChannel;
 import cn.reghao.oss.api.dto.ChannelDto;

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

@@ -1,10 +1,10 @@
-package cn.reghao.dfs.store.rpc;
+package cn.reghao.oss.store.rpc;
 
-import cn.reghao.dfs.store.db.repository.ObjectRepository;
-import cn.reghao.dfs.store.model.po.FileMeta;
-import cn.reghao.dfs.store.service.ObjectNameService;
-import cn.reghao.dfs.store.util.JwtUtil;
-import cn.reghao.dfs.store.util.SignatureUtil;
+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.util.JwtUtil;
+import cn.reghao.oss.store.util.SignatureUtil;
 import cn.reghao.oss.api.constant.ChannelAction;
 import cn.reghao.oss.api.constant.UploadChannel;
 import cn.reghao.oss.api.dto.DownloadUrl;
@@ -12,7 +12,7 @@ import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.oss.api.dto.ObjectPrefix;
 import cn.reghao.oss.api.dto.OssPayload;
 import cn.reghao.oss.api.iface.ObjectService;
-import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
+import cn.reghao.oss.store.db.mapper.FileMetaMapper;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/OssServerServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/OssServerServiceImpl.java

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.rpc;
+package cn.reghao.oss.store.rpc;
 
-import cn.reghao.dfs.store.util.JwtUtil;
+import cn.reghao.oss.store.util.JwtUtil;
 import cn.reghao.oss.api.constant.ChannelAction;
 import cn.reghao.oss.api.constant.UploadChannel;
 import cn.reghao.oss.api.dto.OssPayload;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/PermissionServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/PermissionServiceImpl.java

@@ -1,11 +1,15 @@
-package cn.reghao.dfs.store.rpc;
+package cn.reghao.oss.store.rpc;
 
-import cn.reghao.dfs.store.db.mapper.*;
-import cn.reghao.dfs.store.model.po.AudioFile;
-import cn.reghao.dfs.store.model.po.ImageFile;
-import cn.reghao.dfs.store.model.po.VideoFile;
+import cn.reghao.oss.store.db.mapper.*;
+import cn.reghao.oss.store.model.po.AudioFile;
+import cn.reghao.oss.store.model.po.ImageFile;
+import cn.reghao.oss.store.model.po.VideoFile;
 import cn.reghao.oss.api.constant.ObjectScope;
 import cn.reghao.oss.api.iface.PermissionService;
+import cn.reghao.oss.store.db.mapper.AudioFileMapper;
+import cn.reghao.oss.store.db.mapper.FileMetaMapper;
+import cn.reghao.oss.store.db.mapper.ImageFileMapper;
+import cn.reghao.oss.store.db.mapper.VideoFileMapper;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/SignService.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/SignService.java

@@ -1,7 +1,7 @@
-package cn.reghao.dfs.store.rpc;
+package cn.reghao.oss.store.rpc;
 
-import cn.reghao.dfs.store.util.JwtUtil;
-import cn.reghao.dfs.store.util.SignatureUtil;
+import cn.reghao.oss.store.util.JwtUtil;
+import cn.reghao.oss.store.util.SignatureUtil;
 import cn.reghao.oss.api.constant.ChannelAction;
 import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.constant.UploadChannel;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/disk/DiskServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/disk/DiskServiceImpl.java

@@ -1,9 +1,9 @@
-package cn.reghao.dfs.store.rpc.disk;
+package cn.reghao.oss.store.rpc.disk;
 
 import cn.reghao.oss.api.dto.FileInfo;
 import cn.reghao.oss.api.iface.disk.DiskService;
-import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
-import cn.reghao.dfs.store.service.PutObjectService;
+import cn.reghao.oss.store.db.mapper.FileMetaMapper;
+import cn.reghao.oss.store.service.PutObjectService;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import lombok.extern.slf4j.Slf4j;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/disk/FileServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/disk/FileServiceImpl.java

@@ -1,13 +1,13 @@
-package cn.reghao.dfs.store.rpc.disk;
+package cn.reghao.oss.store.rpc.disk;
 
 import cn.reghao.oss.api.constant.ObjectScope;
 import cn.reghao.oss.api.dto.DirProp;
 import cn.reghao.oss.api.dto.FileProp;
 import cn.reghao.oss.api.iface.disk.FileService;
-import cn.reghao.dfs.store.config.OssProperties;
-import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
-import cn.reghao.dfs.store.model.po.FileMeta;
-import cn.reghao.dfs.store.service.PutObjectService;
+import cn.reghao.oss.store.config.OssProperties;
+import cn.reghao.oss.store.db.mapper.FileMetaMapper;
+import cn.reghao.oss.store.model.po.FileMeta;
+import cn.reghao.oss.store.service.PutObjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/disk/TrashServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/disk/TrashServiceImpl.java

@@ -1,9 +1,9 @@
-package cn.reghao.dfs.store.rpc.disk;
+package cn.reghao.oss.store.rpc.disk;
 
 import cn.reghao.oss.api.dto.DeleteFile;
 import cn.reghao.oss.api.iface.disk.TrashService;
-import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
-import cn.reghao.dfs.store.service.PutObjectService;
+import cn.reghao.oss.store.db.mapper.FileMetaMapper;
+import cn.reghao.oss.store.service.PutObjectService;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import lombok.extern.slf4j.Slf4j;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/media/AudioFileServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/media/AudioFileServiceImpl.java

@@ -1,7 +1,7 @@
-package cn.reghao.dfs.store.rpc.media;
+package cn.reghao.oss.store.rpc.media;
 
-import cn.reghao.dfs.store.db.repository.AudioRepository;
-import cn.reghao.dfs.store.rpc.SignService;
+import cn.reghao.oss.store.db.repository.AudioRepository;
+import cn.reghao.oss.store.rpc.SignService;
 import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.dto.media.AudioInfo;
 import cn.reghao.oss.api.dto.media.AudioUrl;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/media/ConvertServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/media/ConvertServiceImpl.java

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.rpc.media;
+package cn.reghao.oss.store.rpc.media;
 
-import cn.reghao.dfs.store.task.MediaConverter;
+import cn.reghao.oss.store.task.MediaConverter;
 import cn.reghao.oss.api.iface.media.ConvertService;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/media/ImageFileServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/media/ImageFileServiceImpl.java

@@ -1,7 +1,7 @@
-package cn.reghao.dfs.store.rpc.media;
+package cn.reghao.oss.store.rpc.media;
 
-import cn.reghao.dfs.store.db.repository.ImageRepository;
-import cn.reghao.dfs.store.rpc.SignService;
+import cn.reghao.oss.store.db.repository.ImageRepository;
+import cn.reghao.oss.store.rpc.SignService;
 import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.dto.media.ImageUrlDto;
 import cn.reghao.oss.api.iface.media.ImageFileService;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/media/MediaScopeServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/media/MediaScopeServiceImpl.java

@@ -1,12 +1,12 @@
-package cn.reghao.dfs.store.rpc.media;
+package cn.reghao.oss.store.rpc.media;
 
-import cn.reghao.dfs.store.db.mapper.AudioFileMapper;
-import cn.reghao.dfs.store.db.mapper.ImageFileMapper;
-import cn.reghao.dfs.store.db.mapper.VideoFileMapper;
-import cn.reghao.dfs.store.db.repository.ObjectRepository;
-import cn.reghao.dfs.store.model.po.AudioFile;
-import cn.reghao.dfs.store.model.po.ImageFile;
-import cn.reghao.dfs.store.model.po.VideoFile;
+import cn.reghao.oss.store.db.mapper.AudioFileMapper;
+import cn.reghao.oss.store.db.mapper.ImageFileMapper;
+import cn.reghao.oss.store.db.mapper.VideoFileMapper;
+import cn.reghao.oss.store.db.repository.ObjectRepository;
+import cn.reghao.oss.store.model.po.AudioFile;
+import cn.reghao.oss.store.model.po.ImageFile;
+import cn.reghao.oss.store.model.po.VideoFile;
 import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.iface.media.MediaScopeService;
 import org.apache.dubbo.config.annotation.DubboService;

dfs-store/src/main/java/cn/reghao/dfs/store/rpc/media/VideoFileServiceImpl.java → oss-store/src/main/java/cn/reghao/oss/store/rpc/media/VideoFileServiceImpl.java

@@ -1,9 +1,9 @@
-package cn.reghao.dfs.store.rpc.media;
+package cn.reghao.oss.store.rpc.media;
 
-import cn.reghao.dfs.store.db.repository.ObjectRepository;
-import cn.reghao.dfs.store.db.repository.VideoRepository;
-import cn.reghao.dfs.store.model.po.VideoFile;
-import cn.reghao.dfs.store.rpc.SignService;
+import cn.reghao.oss.store.db.repository.ObjectRepository;
+import cn.reghao.oss.store.db.repository.VideoRepository;
+import cn.reghao.oss.store.model.po.VideoFile;
+import cn.reghao.oss.store.rpc.SignService;
 import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.oss.api.dto.media.VideoUrlDto;

dfs-store/src/main/java/cn/reghao/dfs/store/service/ChannelValidateService.java → oss-store/src/main/java/cn/reghao/oss/store/service/ChannelValidateService.java

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.service;
+package cn.reghao.oss.store.service;
 
-import cn.reghao.dfs.store.util.FileType;
+import cn.reghao.oss.store.util.FileType;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.oss.api.constant.SupportedMedia;
 import cn.reghao.oss.api.constant.UploadChannel;

dfs-store/src/main/java/cn/reghao/dfs/store/service/FileStoreService.java → oss-store/src/main/java/cn/reghao/oss/store/service/FileStoreService.java

@@ -1,7 +1,7 @@
-package cn.reghao.dfs.store.service;
+package cn.reghao.oss.store.service;
 
-import cn.reghao.dfs.store.util.store.LoadBalancer;
-import cn.reghao.dfs.store.util.store.StoreDir;
+import cn.reghao.oss.store.util.store.LoadBalancer;
+import cn.reghao.oss.store.util.store.StoreDir;
 import org.apache.commons.io.FileUtils;
 import org.springframework.stereotype.Service;
 

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

@@ -1,17 +1,12 @@
-package cn.reghao.dfs.store.service;
-
-import cn.reghao.dfs.store.config.OssProperties;
-import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
-import cn.reghao.dfs.store.db.repository.ObjectRepository;
-import cn.reghao.dfs.store.model.dto.ContentRange;
-import cn.reghao.dfs.store.model.po.FileMeta;
-import cn.reghao.dfs.store.util.JwtUtil;
-import cn.reghao.dfs.store.util.UserContext;
-import cn.reghao.oss.api.constant.ObjectScope;
-import cn.reghao.oss.api.constant.UploadChannel;
+package cn.reghao.oss.store.service;
+
+import cn.reghao.oss.store.config.OssProperties;
+import cn.reghao.oss.store.db.mapper.FileMetaMapper;
+import cn.reghao.oss.store.db.repository.ObjectRepository;
+import cn.reghao.oss.store.model.dto.ContentRange;
+import cn.reghao.oss.store.model.po.FileMeta;
 import cn.reghao.oss.api.dto.ObjectMeta;
 import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.oss.api.dto.OssPayload;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

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

@@ -1,16 +1,17 @@
-package cn.reghao.dfs.store.service;
+package cn.reghao.oss.store.service;
 
-import cn.reghao.dfs.store.config.OssProperties;
-import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
-import cn.reghao.dfs.store.model.dto.PathUrl;
-import cn.reghao.dfs.store.model.vo.ObjectProp;
-import cn.reghao.dfs.store.util.StringUtil;
+import cn.reghao.oss.store.config.OssProperties;
+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.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.dfs.store.model.po.*;
+import cn.reghao.oss.store.model.po.*;
 import cn.reghao.jutil.jdk.security.DigestUtil;
+import cn.reghao.oss.store.model.po.FileMeta;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

dfs-store/src/main/java/cn/reghao/dfs/store/service/ObjectNameService.java → oss-store/src/main/java/cn/reghao/oss/store/service/ObjectNameService.java

@@ -1,10 +1,10 @@
-package cn.reghao.dfs.store.service;
+package cn.reghao.oss.store.service;
 
-import cn.reghao.dfs.store.config.OssProperties;
-import cn.reghao.dfs.store.db.repository.ObjectRepository;
-import cn.reghao.dfs.store.model.po.FileMeta;
-import cn.reghao.dfs.store.model.vo.ObjectProp;
-import cn.reghao.dfs.store.util.StringUtil;
+import cn.reghao.oss.store.config.OssProperties;
+import cn.reghao.oss.store.db.repository.ObjectRepository;
+import cn.reghao.oss.store.model.po.FileMeta;
+import cn.reghao.oss.store.model.vo.ObjectProp;
+import cn.reghao.oss.store.util.StringUtil;
 import cn.reghao.oss.api.constant.ObjectScope;
 import cn.reghao.oss.api.constant.UploadChannel;
 import org.springframework.stereotype.Service;

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

@@ -1,12 +1,12 @@
-package cn.reghao.dfs.store.service;
+package cn.reghao.oss.store.service;
 
-import cn.reghao.dfs.store.db.repository.ObjectRepository;
-import cn.reghao.dfs.store.model.po.DataBlock;
-import cn.reghao.dfs.store.model.po.FileMeta;
-import cn.reghao.dfs.store.model.vo.ObjectProp;
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.util.FileType;
-import cn.reghao.dfs.store.util.StringUtil;
+import cn.reghao.oss.store.db.repository.ObjectRepository;
+import cn.reghao.oss.store.model.po.DataBlock;
+import cn.reghao.oss.store.model.po.FileMeta;
+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.api.dto.ObjectMeta;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;

dfs-store/src/main/java/cn/reghao/dfs/store/task/FileProcessor.java → oss-store/src/main/java/cn/reghao/oss/store/task/FileProcessor.java

@@ -1,11 +1,11 @@
-package cn.reghao.dfs.store.task;
+package cn.reghao.oss.store.task;
 
-import cn.reghao.dfs.store.db.repository.ImageRepository;
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.task.processor.AudioFileProcessor;
-import cn.reghao.dfs.store.task.processor.DiskFileProcessor;
-import cn.reghao.dfs.store.task.processor.ImageFileProcessor;
-import cn.reghao.dfs.store.task.processor.VideoFileProcessor;
+import cn.reghao.oss.store.db.repository.ImageRepository;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.task.processor.AudioFileProcessor;
+import cn.reghao.oss.store.task.processor.DiskFileProcessor;
+import cn.reghao.oss.store.task.processor.ImageFileProcessor;
+import cn.reghao.oss.store.task.processor.VideoFileProcessor;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.constant.UploadChannel;

dfs-store/src/main/java/cn/reghao/dfs/store/task/FileTask.java → oss-store/src/main/java/cn/reghao/oss/store/task/FileTask.java

@@ -1,8 +1,8 @@
-package cn.reghao.dfs.store.task;
+package cn.reghao.oss.store.task;
 
-import cn.reghao.dfs.store.db.repository.ObjectRepository;
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.task.processor.AudioFileProcessor;
+import cn.reghao.oss.store.db.repository.ObjectRepository;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.task.processor.AudioFileProcessor;
 import cn.reghao.oss.api.dto.ObjectMeta;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

dfs-store/src/main/java/cn/reghao/dfs/store/task/MediaConverter.java → oss-store/src/main/java/cn/reghao/oss/store/task/MediaConverter.java

@@ -1,17 +1,16 @@
-package cn.reghao.dfs.store.task;
-
-import cn.reghao.dfs.store.db.repository.AudioRepository;
-import cn.reghao.dfs.store.db.repository.ObjectRepository;
-import cn.reghao.dfs.store.db.repository.VideoRepository;
-import cn.reghao.dfs.store.model.po.AudioFile;
-import cn.reghao.dfs.store.model.po.VideoFile;
-import cn.reghao.dfs.store.model.vo.ObjectProp;
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.service.FileStoreService;
-import cn.reghao.dfs.store.service.ObjectNameService;
-import cn.reghao.dfs.store.service.PutObjectService;
-import cn.reghao.dfs.store.util.FileType;
-import cn.reghao.dfs.store.util.UserContext;
+package cn.reghao.oss.store.task;
+
+import cn.reghao.oss.store.db.repository.AudioRepository;
+import cn.reghao.oss.store.db.repository.ObjectRepository;
+import cn.reghao.oss.store.db.repository.VideoRepository;
+import cn.reghao.oss.store.model.po.VideoFile;
+import cn.reghao.oss.store.model.vo.ObjectProp;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.service.FileStoreService;
+import cn.reghao.oss.store.service.ObjectNameService;
+import cn.reghao.oss.store.service.PutObjectService;
+import cn.reghao.oss.store.util.FileType;
+import cn.reghao.oss.store.util.UserContext;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import cn.reghao.jutil.media.FFmpegWrapper;

dfs-store/src/main/java/cn/reghao/dfs/store/task/processor/AudioFileProcessor.java → oss-store/src/main/java/cn/reghao/oss/store/task/processor/AudioFileProcessor.java

@@ -1,12 +1,12 @@
-package cn.reghao.dfs.store.task.processor;
-
-import cn.reghao.dfs.store.db.repository.AudioRepository;
-import cn.reghao.dfs.store.model.po.AudioFile;
-import cn.reghao.dfs.store.model.vo.ObjectProp;
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.service.FileStoreService;
-import cn.reghao.dfs.store.service.ObjectNameService;
-import cn.reghao.dfs.store.service.PutObjectService;
+package cn.reghao.oss.store.task.processor;
+
+import cn.reghao.oss.store.db.repository.AudioRepository;
+import cn.reghao.oss.store.model.po.AudioFile;
+import cn.reghao.oss.store.model.vo.ObjectProp;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.service.FileStoreService;
+import cn.reghao.oss.store.service.ObjectNameService;
+import cn.reghao.oss.store.service.PutObjectService;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.media.FFmpegWrapper;
 import cn.reghao.jutil.media.model.AudioProps;

dfs-store/src/main/java/cn/reghao/dfs/store/task/processor/DiskFileProcessor.java → oss-store/src/main/java/cn/reghao/oss/store/task/processor/DiskFileProcessor.java

@@ -1,7 +1,7 @@
-package cn.reghao.dfs.store.task.processor;
+package cn.reghao.oss.store.task.processor;
 
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.service.ObjectNameService;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.service.ObjectNameService;
 import cn.reghao.oss.api.rest.UploadFileRet;
 import org.springframework.stereotype.Service;
 

dfs-store/src/main/java/cn/reghao/dfs/store/task/processor/ImageFileProcessor.java → oss-store/src/main/java/cn/reghao/oss/store/task/processor/ImageFileProcessor.java

@@ -1,13 +1,13 @@
-package cn.reghao.dfs.store.task.processor;
-
-import cn.reghao.dfs.store.db.repository.ImageRepository;
-import cn.reghao.dfs.store.model.vo.ObjectProp;
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.service.FileStoreService;
-import cn.reghao.dfs.store.service.ObjectNameService;
-import cn.reghao.dfs.store.service.PutObjectService;
+package cn.reghao.oss.store.task.processor;
+
+import cn.reghao.oss.store.db.repository.ImageRepository;
+import cn.reghao.oss.store.model.vo.ObjectProp;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.service.FileStoreService;
+import cn.reghao.oss.store.service.ObjectNameService;
+import cn.reghao.oss.store.service.PutObjectService;
 import cn.reghao.jutil.jdk.security.DigestUtil;
-import cn.reghao.dfs.store.model.po.ImageFile;
+import cn.reghao.oss.store.model.po.ImageFile;
 import cn.reghao.jutil.media.ImageOps;
 import cn.reghao.oss.api.constant.SupportedMedia;
 import cn.reghao.oss.api.constant.UploadChannel;

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

@@ -1,14 +1,14 @@
-package cn.reghao.dfs.store.task.processor;
+package cn.reghao.oss.store.task.processor;
 
-import cn.reghao.dfs.store.db.repository.VideoRepository;
-import cn.reghao.dfs.store.service.PutObjectService;
+import cn.reghao.oss.store.db.repository.VideoRepository;
+import cn.reghao.oss.store.service.PutObjectService;
 import cn.reghao.jutil.media.model.AudioProps;
 import cn.reghao.jutil.media.model.MediaProps;
 import cn.reghao.jutil.media.model.VideoProps;
-import cn.reghao.dfs.store.model.vo.ObjectResult;
-import cn.reghao.dfs.store.util.FileType;
-import cn.reghao.dfs.store.service.ObjectNameService;
-import cn.reghao.dfs.store.model.po.VideoFile;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.util.FileType;
+import cn.reghao.oss.store.service.ObjectNameService;
+import cn.reghao.oss.store.model.po.VideoFile;
 import cn.reghao.jutil.media.FFmpegWrapper;
 import cn.reghao.jutil.media.MediaQuality;
 import cn.reghao.jutil.media.MediaResolution;

dfs-store/src/main/java/cn/reghao/dfs/store/util/FileType.java → oss-store/src/main/java/cn/reghao/oss/store/util/FileType.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util;
+package cn.reghao.oss.store.util;
 
 import cn.reghao.jutil.jdk.shell.Shell;
 import cn.reghao.oss.api.constant.ObjectType;

dfs-store/src/main/java/cn/reghao/dfs/store/util/JwtUtil.java → oss-store/src/main/java/cn/reghao/oss/store/util/JwtUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util;
+package cn.reghao.oss.store.util;
 
 import cn.reghao.oss.api.dto.OssPayload;
 import io.jsonwebtoken.Claims;

dfs-store/src/main/java/cn/reghao/dfs/store/util/ObjectUtil.java → oss-store/src/main/java/cn/reghao/oss/store/util/ObjectUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util;
+package cn.reghao.oss.store.util;
 
 import cn.reghao.jutil.web.ServletUtil;
 

dfs-store/src/main/java/cn/reghao/dfs/store/util/SignatureUtil.java → oss-store/src/main/java/cn/reghao/oss/store/util/SignatureUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util;
+package cn.reghao.oss.store.util;
 
 import cn.reghao.jutil.jdk.converter.ByteHex;
 import org.checkerframework.checker.units.qual.A;

dfs-store/src/main/java/cn/reghao/dfs/store/util/StringUtil.java → oss-store/src/main/java/cn/reghao/oss/store/util/StringUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util;
+package cn.reghao.oss.store.util;
 
 /**
  * @author reghao

dfs-store/src/main/java/cn/reghao/dfs/store/util/UserContext.java → oss-store/src/main/java/cn/reghao/oss/store/util/UserContext.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util;
+package cn.reghao.oss.store.util;
 
 /**
  * @author reghao

dfs-store/src/main/java/cn/reghao/dfs/store/util/store/LoadBalancer.java → oss-store/src/main/java/cn/reghao/oss/store/util/store/LoadBalancer.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util.store;
+package cn.reghao.oss.store.util.store;
 
 import org.springframework.stereotype.Component;
 

dfs-store/src/main/java/cn/reghao/dfs/store/util/store/LocalStore.java → oss-store/src/main/java/cn/reghao/oss/store/util/store/LocalStore.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util.store;
+package cn.reghao.oss.store.util.store;
 
 import lombok.Getter;
 

dfs-store/src/main/java/cn/reghao/dfs/store/util/store/LocalStores.java → oss-store/src/main/java/cn/reghao/oss/store/util/store/LocalStores.java

@@ -1,6 +1,6 @@
-package cn.reghao.dfs.store.util.store;
+package cn.reghao.oss.store.util.store;
 
-import cn.reghao.dfs.store.config.OssProperties;
+import cn.reghao.oss.store.config.OssProperties;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

dfs-store/src/main/java/cn/reghao/dfs/store/util/store/StoreDir.java → oss-store/src/main/java/cn/reghao/oss/store/util/store/StoreDir.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.util.store;
+package cn.reghao.oss.store.util.store;
 
 import lombok.AllArgsConstructor;
 

dfs-store/src/main/resources/application.yml → oss-store/src/main/resources/application.yml

@@ -3,9 +3,9 @@ dubbo:
     name: dubbo
     port: 8110
   application:
-    name: dfs-store-provider
+    name: oss-store-provider
   scan:
-    base-packages: cn.reghao.dfs.store.rpc
+    base-packages: cn.reghao.oss.store.rpc
 server:
   port: 8010
   tomcat:
@@ -16,7 +16,7 @@ spring:
       max-request-size: 20GB
       max-file-size: 20GB
   application:
-    name: dfs-store
+    name: oss-store
   profiles:
     active: @profile.active@
   datasource:
@@ -37,4 +37,4 @@ mybatis:
     # mybatis sql 执行日志
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   mapper-locations: classpath*:mapper/**.xml
-  type-aliases-package: cn.reghao.dfs.store.model.po
+  type-aliases-package: cn.reghao.oss.store.model.po

dfs-store/src/main/resources/mapper/AudioFileMapper.xml → oss-store/src/main/resources/mapper/AudioFileMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.dfs.store.db.mapper.AudioFileMapper">
+<mapper namespace="cn.reghao.oss.store.db.mapper.AudioFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into audio_file
         (`audio_file_id`,`object_id`,`duration`,`codec`,`bit_rate`,`url`)
@@ -17,7 +17,7 @@
         </foreach>
     </insert>
 
-    <select id="findByAudioFileId" resultType="cn.reghao.dfs.store.model.po.AudioFile">
+    <select id="findByAudioFileId" resultType="cn.reghao.oss.store.model.po.AudioFile">
         select *
         from audio_file
         where audio_file_id=#{audioFileId}

dfs-store/src/main/resources/mapper/DataBlockMapper.xml → oss-store/src/main/resources/mapper/DataBlockMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.dfs.store.db.mapper.DataBlockMapper">
+<mapper namespace="cn.reghao.oss.store.db.mapper.DataBlockMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into data_block
         (`id`,`deleted`,`create_time`,`update_time`,`content_id`,`index`,`block_id`,`host`,`absolute_path`,`size`,`start`,`end`)
@@ -22,14 +22,14 @@
         where content_id=#{contentId}
     </delete>
 
-    <select id="findDataBlocks" resultType="cn.reghao.dfs.store.model.po.DataBlock">
+    <select id="findDataBlocks" resultType="cn.reghao.oss.store.model.po.DataBlock">
         select *
         from data_block
         where id>#{nextId}
         limit #{pageSize}
     </select>
 
-    <select id="findByContentId" resultType="cn.reghao.dfs.store.model.po.DataBlock">
+    <select id="findByContentId" resultType="cn.reghao.oss.store.model.po.DataBlock">
         select *
         from data_block
         where content_id=#{contentId}

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.dfs.store.db.mapper.FileMetaMapper">
+<mapper namespace="cn.reghao.oss.store.db.mapper.FileMetaMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_meta
         (`id`,`deleted`,`create_time`,`update_time`,`object_name`,`object_id`,`content_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`disk_file`,`scope`)
@@ -63,10 +63,10 @@
     <select id="count" resultType="java.lang.Integer">
         select count(*) from file_meta
     </select>
-    <select id="findAll" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findAll" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select * from file_meta
     </select>
-    <select id="findAll0" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findAll0" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select file_meta.* from file_meta
         inner join bucket
         on bucket.name=#{bucket}
@@ -74,14 +74,14 @@
         limit #{max}
     </select>
     <!-- TODO ${prefix} 和 #{prefix} 的区别 -->
-    <select id="findAll1" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findAll1" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select file_meta.* from file_meta
         inner join bucket
         on bucket.name=#{bucket}
         and object_name regexp concat_ws('', '^', '${prefix}', '([^/])+/?$')
         limit #{max}
     </select>
-    <select id="findAll2" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findAll2" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select file_meta.* from file_meta
         inner join bucket
         on bucket.name=#{bucket}
@@ -90,18 +90,18 @@
         limit #{max}
     </select>
 
-    <select id="findBySha256sum" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findBySha256sum" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select * from file_meta
         where sha256sum=#{sha256sum}
         order by create_time asc
         limit 1
     </select>
-    <select id="findByObjectName" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findByObjectName" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
         where object_name=#{objectName}
     </select>
-    <select id="findByObjectNames" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findByObjectNames" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
         where object_name in
@@ -110,12 +110,12 @@
         </foreach>
     </select>
 
-    <select id="findByObjectId" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findByObjectId" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
         where object_id=#{objectId}
     </select>
-    <select id="findByContentId" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findByContentId" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
         where content_id=#{contentId}
@@ -197,12 +197,12 @@
         on file_meta.deleted=0 and file_meta.file_type=file_type.id and file_meta.file_type=1000 and file_meta.pid=#{pid}
         order by file_type asc
     </select>
-    <select id="findByFilename" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findByFilename" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
         where pid=#{pid} and filename like concat(#{filename},'%')
     </select>
-    <select id="findFileInfos" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findFileInfos" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
         where object_id in
@@ -210,7 +210,7 @@
             #{id}
         </foreach>
     </select>
-    <select id="findByPid" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findByPid" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
         where pid=#{pid}
@@ -229,7 +229,7 @@
         order by file_type asc
     </select>
 
-    <select id="findFileMetaByPage" resultType="cn.reghao.dfs.store.model.po.FileMeta">
+    <select id="findFileMetaByPage" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select * from file_meta
         where file_type!=1000
     </select>

dfs-store/src/main/resources/mapper/FileTypeMapper.xml → oss-store/src/main/resources/mapper/FileTypeMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.dfs.store.db.mapper.FileTypeMapper">
+<mapper namespace="cn.reghao.oss.store.db.mapper.FileTypeMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_type
         (`id`,`code`,`name`,`icon`,`icon_large`)
@@ -9,7 +9,7 @@
         (#{id},#{code},#{name},#{icon},#{iconLarge})
     </insert>
 
-    <select id="findAll" resultType="cn.reghao.dfs.store.model.po.FileType">
+    <select id="findAll" resultType="cn.reghao.oss.store.model.po.FileType">
         select * from file_type
     </select>
 </mapper>

dfs-store/src/main/resources/mapper/ImageFileMapper.xml → oss-store/src/main/resources/mapper/ImageFileMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.dfs.store.db.mapper.ImageFileMapper">
+<mapper namespace="cn.reghao.oss.store.db.mapper.ImageFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into image_file
         (`image_file_id`,`object_id`,`format`,`url`,`width`,`height`,`horizontal`)
@@ -29,15 +29,15 @@
         </foreach>
     </delete>
 
-    <select id="findAll" resultType="cn.reghao.dfs.store.model.po.ImageFile">
+    <select id="findAll" resultType="cn.reghao.oss.store.model.po.ImageFile">
         select * from image_file
     </select>
-    <select id="findByImageFileId" resultType="cn.reghao.dfs.store.model.po.ImageFile">
+    <select id="findByImageFileId" resultType="cn.reghao.oss.store.model.po.ImageFile">
         select *
         from image_file
         where image_file_id=#{imageFileId}
     </select>
-    <select id="findByImageFileIds" resultType="cn.reghao.dfs.store.model.po.ImageFile">
+    <select id="findByImageFileIds" resultType="cn.reghao.oss.store.model.po.ImageFile">
         select *
         from image_file
         where image_file_id in
@@ -45,7 +45,7 @@
             #{item}
         </foreach>
     </select>
-    <select id="findAll1" resultType="cn.reghao.dfs.store.model.vo.ImageObject">
+    <select id="findAll1" resultType="cn.reghao.oss.store.model.vo.ImageObject">
         select image_file_id
         from image_file
     </select>

dfs-store/src/main/resources/mapper/VideoFileMapper.xml → oss-store/src/main/resources/mapper/VideoFileMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.dfs.store.db.mapper.VideoFileMapper">
+<mapper namespace="cn.reghao.oss.store.db.mapper.VideoFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into video_file
         (`video_file_id`,`object_id`,`video_codec`,`vbit_rate`,`audio_codec`,`abit_rate`,`url_type`,`url`,`quality`,`width`,`height`,`horizontal`,`duration`)
@@ -22,7 +22,7 @@
         where video_file_id=#{videoFileId}
     </delete>
 
-    <select id="findAll" resultType="cn.reghao.dfs.store.model.po.VideoFile">
+    <select id="findAll" resultType="cn.reghao.oss.store.model.po.VideoFile">
         select * from video_file
     </select>
     <select id="findVideoInfo" resultType="cn.reghao.oss.api.dto.media.VideoInfo">
@@ -30,7 +30,7 @@
         from video_file
         where video_file_id=#{videoFileId}
     </select>
-    <select id="findByVideoFileId" resultType="cn.reghao.dfs.store.model.po.VideoFile">
+    <select id="findByVideoFileId" resultType="cn.reghao.oss.store.model.po.VideoFile">
         select * from video_file
         where video_file_id=#{videoFileId}
     </select>

dfs-store/src/test/java/FileMetaTest.java → oss-store/src/test/java/FileMetaTest.java

@@ -1,8 +1,10 @@
-import cn.reghao.dfs.store.DfsStoreApplication;
-import cn.reghao.dfs.store.db.mapper.*;
-import cn.reghao.dfs.store.model.po.*;
-import cn.reghao.dfs.store.service.ObjectNameService;
-import cn.reghao.dfs.store.util.UserContext;
+import cn.reghao.oss.store.OssStoreApplication;
+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.service.ObjectNameService;
+import cn.reghao.oss.store.util.UserContext;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
@@ -34,7 +36,7 @@ import java.util.concurrent.ExecutorService;
  */
 @Slf4j
 @ActiveProfiles("dev")
-@SpringBootTest(classes = DfsStoreApplication.class)
+@SpringBootTest(classes = OssStoreApplication.class)
 @RunWith(SpringRunner.class)
 public class FileMetaTest {
     @Autowired

dfs-store/src/test/java/LocalFileTest.java → oss-store/src/test/java/LocalFileTest.java

@@ -1,4 +1,4 @@
-import cn.reghao.dfs.store.util.FileType;
+import cn.reghao.oss.store.util.FileType;
 import cn.reghao.jutil.media.FFmpegWrapper;
 import cn.reghao.jutil.media.MediaQuality;
 import cn.reghao.jutil.media.MediaResolution;

dfs-store/src/test/java/MediaFileTest.java → oss-store/src/test/java/MediaFileTest.java

@@ -1,4 +1,4 @@
-import cn.reghao.dfs.store.DfsStoreApplication;
+import cn.reghao.oss.store.OssStoreApplication;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringRunner;
  */
 @Slf4j
 @ActiveProfiles("dev")
-@SpringBootTest(classes = DfsStoreApplication.class)
+@SpringBootTest(classes = OssStoreApplication.class)
 @RunWith(SpringRunner.class)
 public class MediaFileTest {
 }

zzz/build.sh

@@ -3,5 +3,5 @@
 #######################################################################################################################
 #!/bin/bash
 
-cd /home/reghao/code/java/dfs/dfs-store/
+cd /home/reghao/code/java/dfs/oss-store/
 mvn clean package -Dmaven.test.skip -Ptest