Ver Fonte

修改包名为 cn.reghao.dfs.store

reghao há 3 anos atrás
pai
commit
04d7aa58ab
72 ficheiros alterados com 200 adições e 200 exclusões
  1. 4 4
      pom.xml
  2. 11 0
      src/main/java/cn/reghao/dfs/store/StoreApplication.java
  3. 1 1
      src/main/java/cn/reghao/dfs/store/config/DfsProperties.java
  4. 2 2
      src/main/java/cn/reghao/dfs/store/config/SwaggerConfig.java
  5. 2 2
      src/main/java/cn/reghao/dfs/store/config/WebConfig.java
  6. 5 7
      src/main/java/cn/reghao/dfs/store/controller/FileController.java
  7. 3 3
      src/main/java/cn/reghao/dfs/store/controller/FileDownloadController.java
  8. 8 6
      src/main/java/cn/reghao/dfs/store/controller/FileUploadController.java
  9. 2 2
      src/main/java/cn/reghao/dfs/store/controller/ImageFileController.java
  10. 7 7
      src/main/java/cn/reghao/dfs/store/controller/MediaUploadController.java
  11. 5 5
      src/main/java/cn/reghao/dfs/store/controller/SpiderFileController.java
  12. 2 2
      src/main/java/cn/reghao/dfs/store/controller/VideoFileController.java
  13. 3 3
      src/main/java/cn/reghao/dfs/store/db/mapper/FileInfoMapper.java
  14. 3 3
      src/main/java/cn/reghao/dfs/store/db/mapper/FileUrlMapper.java
  15. 3 3
      src/main/java/cn/reghao/dfs/store/db/mapper/FileUserMapper.java
  16. 2 2
      src/main/java/cn/reghao/dfs/store/db/mapper/ImageFileMapper.java
  17. 2 2
      src/main/java/cn/reghao/dfs/store/db/mapper/VideoFileMapper.java
  18. 16 13
      src/main/java/cn/reghao/dfs/store/db/repository/FileRepository.java
  19. 1 1
      src/main/java/cn/reghao/dfs/store/inerceptor/StaticFileInterceptor.java
  20. 3 3
      src/main/java/cn/reghao/dfs/store/inerceptor/UserContextFiler.java
  21. 1 1
      src/main/java/cn/reghao/dfs/store/model/constant/FileMsgType.java
  22. 1 1
      src/main/java/cn/reghao/dfs/store/model/constant/FileType.java
  23. 1 1
      src/main/java/cn/reghao/dfs/store/model/constant/VideoUrlType.java
  24. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/DownloadFile.java
  25. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/FileContentType.java
  26. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/FileDto.java
  27. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/FileInfoDto.java
  28. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/FileUrlDto.java
  29. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/ImgFileRetDto.java
  30. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/PathUrl.java
  31. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/UploadFile.java
  32. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/UploadFilePart.java
  33. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/UploadPrepare.java
  34. 1 1
      src/main/java/cn/reghao/dfs/store/model/dto/UploadedFile.java
  35. 1 1
      src/main/java/cn/reghao/dfs/store/model/po/FileInfo.java
  36. 1 1
      src/main/java/cn/reghao/dfs/store/model/po/FileUrl.java
  37. 1 1
      src/main/java/cn/reghao/dfs/store/model/po/FileUser.java
  38. 2 2
      src/main/java/cn/reghao/dfs/store/model/po/ImageFile.java
  39. 2 2
      src/main/java/cn/reghao/dfs/store/model/po/VideoFile.java
  40. 1 1
      src/main/java/cn/reghao/dfs/store/model/vo/FileMap.java
  41. 1 1
      src/main/java/cn/reghao/dfs/store/model/vo/UploadFilePartRet.java
  42. 1 1
      src/main/java/cn/reghao/dfs/store/model/vo/UploadFileRet.java
  43. 1 1
      src/main/java/cn/reghao/dfs/store/model/vo/UploadPrepareRet.java
  44. 4 4
      src/main/java/cn/reghao/dfs/store/service/FileDownloadService.java
  45. 1 1
      src/main/java/cn/reghao/dfs/store/service/FileStoreService.java
  46. 2 2
      src/main/java/cn/reghao/dfs/store/service/FileTypeService.java
  47. 10 12
      src/main/java/cn/reghao/dfs/store/service/FileUploadService.java
  48. 8 8
      src/main/java/cn/reghao/dfs/store/service/FileUrlService.java
  49. 8 8
      src/main/java/cn/reghao/dfs/store/service/media/ImageFileService.java
  50. 7 7
      src/main/java/cn/reghao/dfs/store/service/media/VideoFileService.java
  51. 3 3
      src/main/java/cn/reghao/dfs/store/util/FileLifecycle.java
  52. 1 1
      src/main/java/cn/reghao/dfs/store/util/ServletUtil.java
  53. 1 1
      src/main/java/cn/reghao/dfs/store/util/StringUtil.java
  54. 1 1
      src/main/java/cn/reghao/dfs/store/util/UserContext.java
  55. 2 2
      src/main/java/cn/reghao/dfs/store/util/jwt/Jwt.java
  56. 1 1
      src/main/java/cn/reghao/dfs/store/util/jwt/JwtPayload.java
  57. 1 1
      src/main/java/cn/reghao/dfs/store/util/media/ImageOps.java
  58. 1 1
      src/main/java/cn/reghao/dfs/store/util/media/VideoOps.java
  59. 1 1
      src/main/java/cn/reghao/dfs/store/util/store/LoadBalancer.java
  60. 1 1
      src/main/java/cn/reghao/dfs/store/util/store/LocalStore.java
  61. 2 2
      src/main/java/cn/reghao/dfs/store/util/store/LocalStores.java
  62. 1 1
      src/main/java/cn/reghao/dfs/store/util/store/StoreDir.java
  63. 1 1
      src/main/java/cn/reghao/dfs/store/util/type/FileHeader.java
  64. 1 1
      src/main/java/cn/reghao/dfs/store/util/type/FileSignatures.java
  65. 0 15
      src/main/java/cn/reghao/tnb/file/app/FileApplication.java
  66. 2 2
      src/main/resources/application.yml
  67. 7 7
      src/main/resources/mapper/FileInfoMapper.xml
  68. 4 4
      src/main/resources/mapper/FileUrlMapper.xml
  69. 4 4
      src/main/resources/mapper/FileUserMapper.xml
  70. 3 3
      src/main/resources/mapper/ImageFileMapper.xml
  71. 3 3
      src/main/resources/mapper/VideoFileMapper.xml
  72. 9 6
      src/test/java/ConsistentCheckTest.java

+ 4 - 4
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.tnb.file</groupId>
-    <artifactId>file-service</artifactId>
+    <groupId>cn.reghao.dfs</groupId>
+    <artifactId>dfs-store</artifactId>
     <version>1.0.0</version>
 
     <properties>
@@ -37,8 +37,8 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>cn.reghao.tnb.file</groupId>
-            <artifactId>file-api</artifactId>
+            <groupId>cn.reghao.dfs</groupId>
+            <artifactId>dfs-client</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 

+ 11 - 0
src/main/java/cn/reghao/dfs/store/StoreApplication.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/config/DfsProperties.java → src/main/java/cn/reghao/dfs/store/config/DfsProperties.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.config;
+package cn.reghao.dfs.store.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/config/SwaggerConfig.java → src/main/java/cn/reghao/dfs/store/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.config;
+package cn.reghao.dfs.store.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -27,7 +27,7 @@ public class SwaggerConfig {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("cn.reghao.tnb.file.app.controller"))
+                .apis(RequestHandlerSelectors.basePackage("cn.reghao.dfs.store.controller"))
                 .paths(PathSelectors.any())
                 .build();
     }

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/config/WebConfig.java → src/main/java/cn/reghao/dfs/store/config/WebConfig.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.file.app.config;
+package cn.reghao.dfs.store.config;
 
-import cn.reghao.tnb.file.app.inerceptor.StaticFileInterceptor;
+import cn.reghao.dfs.store.inerceptor.StaticFileInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

+ 5 - 7
src/main/java/cn/reghao/tnb/file/app/controller/FileController.java → src/main/java/cn/reghao/dfs/store/controller/FileController.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.dfs.store.controller;
 
+import cn.reghao.dfs.store.util.store.LocalStore;
+import cn.reghao.dfs.store.util.store.LocalStores;
+import cn.reghao.dfs.store.util.store.StoreDir;
 import cn.reghao.jutil.jdk.result.WebBody;
-import cn.reghao.tnb.file.app.db.repository.FileRepository;
-import cn.reghao.tnb.file.app.util.store.LocalStore;
-import cn.reghao.tnb.file.app.util.store.LocalStores;
-import cn.reghao.tnb.file.app.util.store.StoreDir;
+import cn.reghao.dfs.store.db.repository.FileRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.ibatis.annotations.Param;
@@ -12,8 +12,6 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao

+ 3 - 3
src/main/java/cn/reghao/tnb/file/app/controller/FileDownloadController.java → src/main/java/cn/reghao/dfs/store/controller/FileDownloadController.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.dfs.store.controller;
 
-import cn.reghao.tnb.file.app.model.dto.DownloadFile;
-import cn.reghao.tnb.file.app.service.FileDownloadService;
+import cn.reghao.dfs.store.model.dto.DownloadFile;
+import cn.reghao.dfs.store.service.FileDownloadService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

+ 8 - 6
src/main/java/cn/reghao/tnb/file/app/controller/FileUploadController.java → src/main/java/cn/reghao/dfs/store/controller/FileUploadController.java

@@ -1,11 +1,13 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.dfs.store.controller;
 
+import cn.reghao.dfs.store.model.dto.UploadFile;
+import cn.reghao.dfs.store.model.dto.UploadFilePart;
+import cn.reghao.dfs.store.model.dto.UploadPrepare;
+import cn.reghao.dfs.store.service.FileUploadService;
 import cn.reghao.jutil.jdk.result.WebBody;
-import cn.reghao.tnb.file.app.model.dto.*;
-import cn.reghao.tnb.file.app.model.vo.UploadFilePartRet;
-import cn.reghao.tnb.file.app.model.vo.UploadPrepareRet;
-import cn.reghao.tnb.file.app.model.vo.UploadFileRet;
-import cn.reghao.tnb.file.app.service.FileUploadService;
+import cn.reghao.dfs.store.model.vo.UploadFilePartRet;
+import cn.reghao.dfs.store.model.vo.UploadPrepareRet;
+import cn.reghao.dfs.store.model.vo.UploadFileRet;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/controller/ImageFileController.java → src/main/java/cn/reghao/dfs/store/controller/ImageFileController.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.dfs.store.controller;
 
-import cn.reghao.tnb.file.app.service.FileUrlService;
+import cn.reghao.dfs.store.service.FileUrlService;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

+ 7 - 7
src/main/java/cn/reghao/tnb/file/app/controller/MediaUploadController.java → src/main/java/cn/reghao/dfs/store/controller/MediaUploadController.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.dfs.store.controller;
 
+import cn.reghao.dfs.store.model.dto.UploadFile;
+import cn.reghao.dfs.store.model.dto.UploadedFile;
+import cn.reghao.dfs.store.service.FileUploadService;
+import cn.reghao.dfs.store.service.media.ImageFileService;
 import cn.reghao.jutil.jdk.result.WebBody;
-import cn.reghao.tnb.file.app.model.dto.UploadFile;
-import cn.reghao.tnb.file.app.model.dto.UploadedFile;
-import cn.reghao.tnb.file.app.model.vo.UploadFileRet;
-import cn.reghao.tnb.file.app.service.FileUploadService;
-import cn.reghao.tnb.file.app.service.media.ImageFileService;
-import cn.reghao.tnb.file.app.service.media.VideoFileService;
+import cn.reghao.dfs.store.model.vo.UploadFileRet;
+import cn.reghao.dfs.store.service.media.VideoFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

+ 5 - 5
src/main/java/cn/reghao/tnb/file/app/controller/SpiderFileController.java → src/main/java/cn/reghao/dfs/store/controller/SpiderFileController.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.dfs.store.controller;
 
+import cn.reghao.dfs.store.model.dto.UploadedFile;
+import cn.reghao.dfs.store.service.FileUploadService;
 import cn.reghao.jutil.jdk.result.WebBody;
-import cn.reghao.tnb.file.app.db.mapper.FileUserMapper;
-import cn.reghao.tnb.file.app.model.dto.UploadedFile;
-import cn.reghao.tnb.file.app.model.vo.UploadFileRet;
-import cn.reghao.tnb.file.app.service.FileUploadService;
+import cn.reghao.dfs.store.db.mapper.FileUserMapper;
+import cn.reghao.dfs.store.model.vo.UploadFileRet;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/controller/VideoFileController.java → src/main/java/cn/reghao/dfs/store/controller/VideoFileController.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.dfs.store.controller;
 
-import cn.reghao.tnb.file.app.service.FileUrlService;
+import cn.reghao.dfs.store.service.FileUrlService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

+ 3 - 3
src/main/java/cn/reghao/tnb/file/app/db/mapper/FileInfoMapper.java → src/main/java/cn/reghao/dfs/store/db/mapper/FileInfoMapper.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.dfs.store.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.dto.FileDto;
-import cn.reghao.tnb.file.app.model.po.FileInfo;
+import cn.reghao.dfs.store.model.dto.FileDto;
+import cn.reghao.dfs.store.model.po.FileInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
src/main/java/cn/reghao/tnb/file/app/db/mapper/FileUrlMapper.java → src/main/java/cn/reghao/dfs/store/db/mapper/FileUrlMapper.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.dfs.store.db.mapper;
 
+import cn.reghao.dfs.store.model.dto.FileUrlDto;
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.dto.FileUrlDto;
-import cn.reghao.tnb.file.app.model.po.FileUrl;
+import cn.reghao.dfs.store.model.po.FileUrl;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
src/main/java/cn/reghao/tnb/file/app/db/mapper/FileUserMapper.java → src/main/java/cn/reghao/dfs/store/db/mapper/FileUserMapper.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.dfs.store.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.FileInfo;
-import cn.reghao.tnb.file.app.model.po.FileUser;
+import cn.reghao.dfs.store.model.po.FileInfo;
+import cn.reghao.dfs.store.model.po.FileUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/db/mapper/ImageFileMapper.java → src/main/java/cn/reghao/dfs/store/db/mapper/ImageFileMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.dfs.store.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.ImageFile;
+import cn.reghao.dfs.store.model.po.ImageFile;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/db/mapper/VideoFileMapper.java → src/main/java/cn/reghao/dfs/store/db/mapper/VideoFileMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.dfs.store.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.VideoFile;
+import cn.reghao.dfs.store.model.po.VideoFile;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 16 - 13
src/main/java/cn/reghao/tnb/file/app/db/repository/FileRepository.java → src/main/java/cn/reghao/dfs/store/db/repository/FileRepository.java

@@ -1,17 +1,20 @@
-package cn.reghao.tnb.file.app.db.repository;
-
+package cn.reghao.dfs.store.db.repository;
+
+import cn.reghao.dfs.store.db.mapper.FileInfoMapper;
+import cn.reghao.dfs.store.db.mapper.FileUrlMapper;
+import cn.reghao.dfs.store.db.mapper.FileUserMapper;
+import cn.reghao.dfs.store.model.dto.FileContentType;
+import cn.reghao.dfs.store.model.dto.PathUrl;
+import cn.reghao.dfs.store.model.dto.UploadPrepare;
+import cn.reghao.dfs.store.model.dto.UploadedFile;
+import cn.reghao.dfs.store.util.store.LocalStores;
 import cn.reghao.jutil.tool.id.IdGenerator;
-import cn.reghao.tnb.file.app.db.mapper.FileInfoMapper;
-import cn.reghao.tnb.file.app.db.mapper.FileUrlMapper;
-import cn.reghao.tnb.file.app.db.mapper.FileUserMapper;
-import cn.reghao.tnb.file.app.model.dto.*;
-import cn.reghao.tnb.file.app.model.po.FileInfo;
-import cn.reghao.tnb.file.app.model.po.FileUrl;
-import cn.reghao.tnb.file.app.model.po.FileUser;
-import cn.reghao.tnb.file.app.model.vo.FileMap;
-import cn.reghao.tnb.file.app.util.store.LocalStores;
-import cn.reghao.tnb.file.app.util.StringUtil;
-import cn.reghao.tnb.file.app.util.UserContext;
+import cn.reghao.dfs.store.model.po.FileInfo;
+import cn.reghao.dfs.store.model.po.FileUrl;
+import cn.reghao.dfs.store.model.po.FileUser;
+import cn.reghao.dfs.store.model.vo.FileMap;
+import cn.reghao.dfs.store.util.StringUtil;
+import cn.reghao.dfs.store.util.UserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/inerceptor/StaticFileInterceptor.java → src/main/java/cn/reghao/dfs/store/inerceptor/StaticFileInterceptor.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.inerceptor;
+package cn.reghao.dfs.store.inerceptor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;

+ 3 - 3
src/main/java/cn/reghao/tnb/file/app/inerceptor/UserContextFiler.java → src/main/java/cn/reghao/dfs/store/inerceptor/UserContextFiler.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.inerceptor;
+package cn.reghao.dfs.store.inerceptor;
 
+import cn.reghao.dfs.store.util.jwt.Jwt;
 import cn.reghao.jutil.jdk.result.WebBody;
-import cn.reghao.tnb.file.app.util.UserContext;
-import cn.reghao.tnb.file.app.util.jwt.Jwt;
+import cn.reghao.dfs.store.util.UserContext;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/constant/FileMsgType.java → src/main/java/cn/reghao/dfs/store/model/constant/FileMsgType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.constant;
+package cn.reghao.dfs.store.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/constant/FileType.java → src/main/java/cn/reghao/dfs/store/model/constant/FileType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.constant;
+package cn.reghao.dfs.store.model.constant;
 
 /**
  * @author reghao

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/constant/VideoUrlType.java → src/main/java/cn/reghao/dfs/store/model/constant/VideoUrlType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.constant;
+package cn.reghao.dfs.store.model.constant;
 
 /**
  * @author reghao

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/DownloadFile.java → src/main/java/cn/reghao/dfs/store/model/dto/DownloadFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.dfs.store.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/FileContentType.java → src/main/java/cn/reghao/dfs/store/model/dto/FileContentType.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/FileDto.java → src/main/java/cn/reghao/dfs/store/model/dto/FileDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.dfs.store.model.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/FileInfoDto.java → src/main/java/cn/reghao/dfs/store/model/dto/FileInfoDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.dfs.store.model.dto;
 
 import lombok.Getter;
 

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/FileUrlDto.java → src/main/java/cn/reghao/dfs/store/model/dto/FileUrlDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.dfs.store.model.dto;
 
 import lombok.Getter;
 

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/ImgFileRetDto.java → src/main/java/cn/reghao/dfs/store/model/dto/ImgFileRetDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.dfs.store.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/PathUrl.java → src/main/java/cn/reghao/dfs/store/model/dto/PathUrl.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/UploadFile.java → src/main/java/cn/reghao/dfs/store/model/dto/UploadFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.dfs.store.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/UploadFilePart.java → src/main/java/cn/reghao/dfs/store/model/dto/UploadFilePart.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.dfs.store.model.dto;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/UploadPrepare.java → src/main/java/cn/reghao/dfs/store/model/dto/UploadPrepare.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.dfs.store.model.dto;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/dto/UploadedFile.java → src/main/java/cn/reghao/dfs/store/model/dto/UploadedFile.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/po/FileInfo.java → src/main/java/cn/reghao/dfs/store/model/po/FileInfo.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/po/FileUrl.java → src/main/java/cn/reghao/dfs/store/model/po/FileUrl.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/po/FileUser.java → src/main/java/cn/reghao/dfs/store/model/po/FileUser.java

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

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/model/po/ImageFile.java → src/main/java/cn/reghao/dfs/store/model/po/ImageFile.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.dfs.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.tnb.file.client.model.SpiderImageFile;
+import cn.reghao.dfs.client.model.SpiderImageFile;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/model/po/VideoFile.java → src/main/java/cn/reghao/dfs/store/model/po/VideoFile.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.dfs.store.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.tnb.file.client.model.SpiderVideoFile;
+import cn.reghao.dfs.client.model.SpiderVideoFile;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/vo/FileMap.java → src/main/java/cn/reghao/dfs/store/model/vo/FileMap.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/vo/UploadFilePartRet.java → src/main/java/cn/reghao/dfs/store/model/vo/UploadFilePartRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.vo;
+package cn.reghao.dfs.store.model.vo;
 
 import lombok.AllArgsConstructor;
 

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/vo/UploadFileRet.java → src/main/java/cn/reghao/dfs/store/model/vo/UploadFileRet.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/model/vo/UploadPrepareRet.java → src/main/java/cn/reghao/dfs/store/model/vo/UploadPrepareRet.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.vo;
+package cn.reghao.dfs.store.model.vo;
 
 import lombok.AllArgsConstructor;
 

+ 4 - 4
src/main/java/cn/reghao/tnb/file/app/service/FileDownloadService.java → src/main/java/cn/reghao/dfs/store/service/FileDownloadService.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.service;
+package cn.reghao.dfs.store.service;
 
-import cn.reghao.tnb.file.app.model.dto.DownloadFile;
-import cn.reghao.tnb.file.app.model.dto.FileUrlDto;
-import cn.reghao.tnb.file.app.util.ServletUtil;
+import cn.reghao.dfs.store.model.dto.DownloadFile;
+import cn.reghao.dfs.store.model.dto.FileUrlDto;
+import cn.reghao.dfs.store.util.ServletUtil;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/service/FileStoreService.java → src/main/java/cn/reghao/dfs/store/service/FileStoreService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.service;
+package cn.reghao.dfs.store.service;
 
 import org.apache.commons.io.FileUtils;
 import org.springframework.stereotype.Service;

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/service/FileTypeService.java → src/main/java/cn/reghao/dfs/store/service/FileTypeService.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.file.app.service;
+package cn.reghao.dfs.store.service;
 
-import cn.reghao.tnb.file.app.model.dto.FileContentType;
+import cn.reghao.dfs.store.model.dto.FileContentType;
 import org.springframework.stereotype.Service;
 
 import java.nio.file.Files;

+ 10 - 12
src/main/java/cn/reghao/tnb/file/app/service/FileUploadService.java → src/main/java/cn/reghao/dfs/store/service/FileUploadService.java

@@ -1,17 +1,15 @@
-package cn.reghao.tnb.file.app.service;
+package cn.reghao.dfs.store.service;
 
+import cn.reghao.dfs.store.model.dto.*;
 import cn.reghao.jutil.jdk.security.DigestUtil;
-import cn.reghao.tnb.file.app.model.vo.FileMap;
-import cn.reghao.tnb.file.app.model.vo.UploadFilePartRet;
-import cn.reghao.tnb.file.app.model.vo.UploadFileRet;
-import cn.reghao.tnb.file.app.model.vo.UploadPrepareRet;
-import cn.reghao.tnb.file.app.model.dto.PathUrl;
-import cn.reghao.tnb.file.app.db.repository.FileRepository;
-import cn.reghao.tnb.file.app.model.dto.*;
-import cn.reghao.tnb.file.app.model.po.FileInfo;
-import cn.reghao.tnb.file.app.util.StringUtil;
-import cn.reghao.tnb.file.app.util.media.ImageOps;
-import cn.reghao.tnb.file.app.util.store.LocalStores;
+import cn.reghao.dfs.store.model.vo.FileMap;
+import cn.reghao.dfs.store.model.vo.UploadFilePartRet;
+import cn.reghao.dfs.store.model.vo.UploadFileRet;
+import cn.reghao.dfs.store.model.vo.UploadPrepareRet;
+import cn.reghao.dfs.store.db.repository.FileRepository;
+import cn.reghao.dfs.store.model.po.FileInfo;
+import cn.reghao.dfs.store.util.StringUtil;
+import cn.reghao.dfs.store.util.store.LocalStores;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 8 - 8
src/main/java/cn/reghao/tnb/file/app/service/FileUrlService.java → src/main/java/cn/reghao/dfs/store/service/FileUrlService.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.file.app.service;
+package cn.reghao.dfs.store.service;
 
-import cn.reghao.tnb.file.app.config.DfsProperties;
-import cn.reghao.tnb.file.app.model.dto.PathUrl;
-import cn.reghao.tnb.file.app.db.mapper.FileUrlMapper;
-import cn.reghao.tnb.file.app.model.dto.FileUrlDto;
-import cn.reghao.tnb.file.app.util.store.LoadBalancer;
-import cn.reghao.tnb.file.app.util.store.LocalStores;
-import cn.reghao.tnb.file.app.util.store.StoreDir;
+import cn.reghao.dfs.store.config.DfsProperties;
+import cn.reghao.dfs.store.model.dto.FileUrlDto;
+import cn.reghao.dfs.store.util.store.LoadBalancer;
+import cn.reghao.dfs.store.util.store.LocalStores;
+import cn.reghao.dfs.store.util.store.StoreDir;
+import cn.reghao.dfs.store.model.dto.PathUrl;
+import cn.reghao.dfs.store.db.mapper.FileUrlMapper;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;

+ 8 - 8
src/main/java/cn/reghao/tnb/file/app/service/media/ImageFileService.java → src/main/java/cn/reghao/dfs/store/service/media/ImageFileService.java

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.file.app.service.media;
-
-import cn.reghao.tnb.file.app.model.dto.PathUrl;
-import cn.reghao.tnb.file.app.db.mapper.ImageFileMapper;
-import cn.reghao.tnb.file.app.model.dto.FileDto;
-import cn.reghao.tnb.file.app.model.po.ImageFile;
-import cn.reghao.tnb.file.app.model.dto.ImgFileRetDto;
-import cn.reghao.tnb.file.app.util.media.ImageOps;
+package cn.reghao.dfs.store.service.media;
+
+import cn.reghao.dfs.store.util.media.ImageOps;
+import cn.reghao.dfs.store.model.dto.PathUrl;
+import cn.reghao.dfs.store.db.mapper.ImageFileMapper;
+import cn.reghao.dfs.store.model.dto.FileDto;
+import cn.reghao.dfs.store.model.po.ImageFile;
+import cn.reghao.dfs.store.model.dto.ImgFileRetDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 7 - 7
src/main/java/cn/reghao/tnb/file/app/service/media/VideoFileService.java → src/main/java/cn/reghao/dfs/store/service/media/VideoFileService.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.file.app.service.media;
+package cn.reghao.dfs.store.service.media;
 
+import cn.reghao.dfs.store.model.constant.VideoUrlType;
+import cn.reghao.dfs.store.model.dto.ImgFileRetDto;
+import cn.reghao.dfs.store.util.media.VideoOps;
 import cn.reghao.jutil.jdk.security.DigestUtil;
-import cn.reghao.tnb.file.app.model.constant.VideoUrlType;
-import cn.reghao.tnb.file.app.model.dto.PathUrl;
-import cn.reghao.tnb.file.app.db.mapper.VideoFileMapper;
-import cn.reghao.tnb.file.app.model.dto.*;
-import cn.reghao.tnb.file.app.model.po.VideoFile;
-import cn.reghao.tnb.file.app.util.media.VideoOps;
+import cn.reghao.dfs.store.model.dto.PathUrl;
+import cn.reghao.dfs.store.db.mapper.VideoFileMapper;
+import cn.reghao.dfs.store.model.po.VideoFile;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 3 - 3
src/main/java/cn/reghao/tnb/file/app/util/FileLifecycle.java → src/main/java/cn/reghao/dfs/store/util/FileLifecycle.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.util;
+package cn.reghao.dfs.store.util;
 
-import cn.reghao.tnb.file.app.config.DfsProperties;
-import cn.reghao.tnb.file.app.util.store.LocalStores;
+import cn.reghao.dfs.store.config.DfsProperties;
+import cn.reghao.dfs.store.util.store.LocalStores;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/ServletUtil.java → src/main/java/cn/reghao/dfs/store/util/ServletUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util;
+package cn.reghao.dfs.store.util;
 
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/StringUtil.java → src/main/java/cn/reghao/dfs/store/util/StringUtil.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/UserContext.java → src/main/java/cn/reghao/dfs/store/util/UserContext.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util;
+package cn.reghao.dfs.store.util;
 
 /**
  * 获取当前请求的用户

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/util/jwt/Jwt.java → src/main/java/cn/reghao/dfs/store/util/jwt/Jwt.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.file.app.util.jwt;
+package cn.reghao.dfs.store.util.jwt;
 
-import cn.reghao.tnb.file.app.util.ServletUtil;
+import cn.reghao.dfs.store.util.ServletUtil;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/jwt/JwtPayload.java → src/main/java/cn/reghao/dfs/store/util/jwt/JwtPayload.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util.jwt;
+package cn.reghao.dfs.store.util.jwt;
 
 import lombok.Data;
 

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/media/ImageOps.java → src/main/java/cn/reghao/dfs/store/util/media/ImageOps.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util.media;
+package cn.reghao.dfs.store.util.media;
 
 import javax.imageio.ImageIO;
 import java.awt.*;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/media/VideoOps.java → src/main/java/cn/reghao/dfs/store/util/media/VideoOps.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util.media;
+package cn.reghao.dfs.store.util.media;
 
 import org.bytedeco.javacv.FFmpegFrameGrabber;
 import org.bytedeco.javacv.Frame;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/store/LoadBalancer.java → src/main/java/cn/reghao/dfs/store/util/store/LoadBalancer.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util.store;
+package cn.reghao.dfs.store.util.store;
 
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import com.google.common.hash.HashFunction;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/store/LocalStore.java → src/main/java/cn/reghao/dfs/store/util/store/LocalStore.java

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

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/util/store/LocalStores.java → src/main/java/cn/reghao/dfs/store/util/store/LocalStores.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.file.app.util.store;
+package cn.reghao.dfs.store.util.store;
 
-import cn.reghao.tnb.file.app.config.DfsProperties;
+import cn.reghao.dfs.store.config.DfsProperties;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/store/StoreDir.java → src/main/java/cn/reghao/dfs/store/util/store/StoreDir.java

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

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/type/FileHeader.java → src/main/java/cn/reghao/dfs/store/util/type/FileHeader.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util.type;
+package cn.reghao.dfs.store.util.type;
 
 import java.io.*;
 

+ 1 - 1
src/main/java/cn/reghao/tnb/file/app/util/type/FileSignatures.java → src/main/java/cn/reghao/dfs/store/util/type/FileSignatures.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util.type;
+package cn.reghao.dfs.store.util.type;
 
 import java.io.InputStream;
 import java.util.HashMap;

+ 0 - 15
src/main/java/cn/reghao/tnb/file/app/FileApplication.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.file.app;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@SpringBootApplication
-@ComponentScan({"cn.reghao.tnb.file.app", "cn.reghao.tnb.file.util","cn.reghao.tnb.common"})
-//@EnableTransactionManagement
-public class FileApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(FileApplication.class, args);
-    }
-}

+ 2 - 2
src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
       max-request-size: 20GB
       max-file-size: 20GB
   application:
-    name: file-service
+    name: dfs-store
   profiles:
     active: @profile.active@
   datasource:
@@ -25,4 +25,4 @@ mybatis:
   configuration:
     map-underscore-to-camel-case: true
   mapper-locations: classpath*:mapper/**/**.xml
-  type-aliases-package: cn.reghao.tnb.file.app.model.po
+  type-aliases-package: cn.reghao.dfs.store.model.po

+ 7 - 7
src/main/resources/mapper/FileInfoMapper.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.tnb.file.app.db.mapper.FileInfoMapper">
+<mapper namespace="cn.reghao.dfs.store.db.mapper.FileInfoMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_info
         (`id`,`deleted`,`create_time`,`update_time`,`file_id`,`sha256sum`,`filename`,`suffix`,`size`,`file_type`,`content_type`,`uploaded`)
@@ -26,25 +26,25 @@
         where file_id=#{fileId}
     </update>
 
-    <select id="findBySha256sum" resultType="cn.reghao.tnb.file.app.model.dto.FileDto">
+    <select id="findBySha256sum" resultType="cn.reghao.dfs.store.model.dto.FileDto">
         select file.file_id as fileId,file.filename,url.url from file_info file
         inner join file_url url
         on file.file_id=url.file_id and file.sha256sum=#{sha256sum}
         order by url.create_time desc limit 1
     </select>
-    <select id="findFileInfoBySha256sum" resultType="cn.reghao.tnb.file.app.model.po.FileInfo">
+    <select id="findFileInfoBySha256sum" resultType="cn.reghao.dfs.store.model.po.FileInfo">
         select * from file_info where sha256sum=#{sha256sum}
     </select>
-    <select id="findByFileId" resultType="cn.reghao.tnb.file.app.model.po.FileInfo">
+    <select id="findByFileId" resultType="cn.reghao.dfs.store.model.po.FileInfo">
         select * from file_info where file_id=#{fileId}
     </select>
-    <select id="findAllByPage" resultType="cn.reghao.tnb.file.app.model.po.FileInfo">
+    <select id="findAllByPage" resultType="cn.reghao.dfs.store.model.po.FileInfo">
         select * from file_info
     </select>
-    <select id="findAll" resultType="cn.reghao.tnb.file.app.model.po.FileInfo">
+    <select id="findAll" resultType="cn.reghao.dfs.store.model.po.FileInfo">
         select * from file_info
     </select>
-    <select id="findAllByUploaded" resultType="cn.reghao.tnb.file.app.model.po.FileInfo">
+    <select id="findAllByUploaded" resultType="cn.reghao.dfs.store.model.po.FileInfo">
         select * from file_info where uploaded is true
     </select>
 </mapper>

+ 4 - 4
src/main/resources/mapper/FileUrlMapper.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.tnb.file.app.db.mapper.FileUrlMapper">
+<mapper namespace="cn.reghao.dfs.store.db.mapper.FileUrlMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_url
         (`id`,`deleted`,`create_time`,`update_time`,`file_id`,`block_id`,`relative_path`,`url`,`path`,`group`,`node`)
@@ -14,17 +14,17 @@
         where file_id=#{fileId}
     </update>
 
-    <select id="findAll" resultType="cn.reghao.tnb.file.app.model.po.FileUrl">
+    <select id="findAll" resultType="cn.reghao.dfs.store.model.po.FileUrl">
         select * from file_url
     </select>
-    <select id="findByUploadId" resultType="cn.reghao.tnb.file.app.model.dto.FileUrlDto">
+    <select id="findByUploadId" resultType="cn.reghao.dfs.store.model.dto.FileUrlDto">
         select info.id,info.filename,url.block_id,url.path,url.url,url.relative_path as relativePath from file_url url
         inner join file_user fileUser
         inner join file_info info
         on fileUser.file_id=url.file_id and info.file_id=url.file_id and fileUser.upload_id=#{uploadId}
         limit 1
     </select>
-    <select id="findByFileId" resultType="cn.reghao.tnb.file.app.model.po.FileUrl">
+    <select id="findByFileId" resultType="cn.reghao.dfs.store.model.po.FileUrl">
         select * from file_url where file_id=#{fileId}
     </select>
 </mapper>

+ 4 - 4
src/main/resources/mapper/FileUserMapper.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.tnb.file.app.db.mapper.FileUserMapper">
+<mapper namespace="cn.reghao.dfs.store.db.mapper.FileUserMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_user
         (`id`,`deleted`,`create_time`,`update_time`,`upload_id`,`upload_by`,`file_id`)
@@ -9,15 +9,15 @@
         (#{id},#{deleted},#{createTime},#{updateTime},#{uploadId},#{uploadBy},#{fileId})
     </insert>
 
-    <select id="findByFileAndUserId" resultType="cn.reghao.tnb.file.app.model.po.FileUser">
+    <select id="findByFileAndUserId" resultType="cn.reghao.dfs.store.model.po.FileUser">
         select * from file_user
         where file_id=#{fileId} and upload_by=#{userId}
     </select>
-    <select id="findByUploadAndUserId" resultType="cn.reghao.tnb.file.app.model.po.FileUser">
+    <select id="findByUploadAndUserId" resultType="cn.reghao.dfs.store.model.po.FileUser">
         select * from file_user
         where upload_id=#{uploadId} and upload_by=#{userId}
     </select>
-    <select id="findFileInfoByUploadId" resultType="cn.reghao.tnb.file.app.model.po.FileInfo">
+    <select id="findFileInfoByUploadId" resultType="cn.reghao.dfs.store.model.po.FileInfo">
         select fileInfo.* from file_info fileInfo
         inner join file_user fileUser
         on fileUser.file_id=fileInfo.file_id and fileUser.upload_id=#{uploadId}

+ 3 - 3
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.tnb.file.app.db.mapper.ImageFileMapper">
+<mapper namespace="cn.reghao.dfs.store.db.mapper.ImageFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into image_file
         (`id`,`deleted`,`create_time`,`update_time`,`file_id`,`base_url`,`width`,`height`)
@@ -22,10 +22,10 @@
         where file_id=#{fileId}
     </update>
 
-    <select id="findByFileId" resultType="cn.reghao.tnb.file.app.model.po.ImageFile">
+    <select id="findByFileId" resultType="cn.reghao.dfs.store.model.po.ImageFile">
         select * from image_file where file_id=#{fileId}
     </select>
-    <select id="findByFileIds" resultType="cn.reghao.tnb.file.app.model.po.ImageFile">
+    <select id="findByFileIds" resultType="cn.reghao.dfs.store.model.po.ImageFile">
         select * from image_file where file_id in #{list}
     </select>
 </mapper>

+ 3 - 3
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.tnb.file.app.db.mapper.VideoFileMapper">
+<mapper namespace="cn.reghao.dfs.store.db.mapper.VideoFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into video_file
         (`id`,`deleted`,`create_time`,`update_time`,`file_id`,`bandwidth`,`frame_rate`,`width`,`height`,`horizontal`,`rotate`,`url_type`,`base_url`,`backup_url`,`duration`,`base_cover_url`)
@@ -18,10 +18,10 @@
         where file_id=#{fileId}
     </update>
 
-    <select id="findByFileId" resultType="cn.reghao.tnb.file.app.model.po.VideoFile">
+    <select id="findByFileId" resultType="cn.reghao.dfs.store.model.po.VideoFile">
         select * from video_file where file_id=#{fileId} order by create_time desc limit 1
     </select>
-    <select id="findByMatchBaseUrl" resultType="cn.reghao.tnb.file.app.model.po.VideoFile">
+    <select id="findByMatchBaseUrl" resultType="cn.reghao.dfs.store.model.po.VideoFile">
         select * from video_file where base_url like concat('%',#{pattern},'%')
     </select>
 </mapper>

+ 9 - 6
src/test/java/ConsistentCheckTest.java

@@ -1,9 +1,12 @@
+import cn.reghao.dfs.store.db.mapper.FileInfoMapper;
+import cn.reghao.dfs.store.db.mapper.FileUrlMapper;
+import cn.reghao.dfs.store.db.mapper.FileUserMapper;
+import cn.reghao.dfs.store.db.mapper.VideoFileMapper;
 import cn.reghao.jutil.jdk.security.DigestUtil;
-import cn.reghao.tnb.file.app.FileApplication;
-import cn.reghao.tnb.file.app.db.mapper.*;
-import cn.reghao.tnb.file.app.model.po.FileInfo;
-import cn.reghao.tnb.file.app.model.po.FileUrl;
-import cn.reghao.tnb.file.app.util.store.LocalStores;
+import cn.reghao.dfs.store.StoreApplication;
+import cn.reghao.dfs.store.model.po.FileInfo;
+import cn.reghao.dfs.store.model.po.FileUrl;
+import cn.reghao.dfs.store.util.store.LocalStores;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +29,7 @@ import java.util.*;
  */
 @Slf4j
 @ActiveProfiles("dev")
-@SpringBootTest(classes = FileApplication.class)
+@SpringBootTest(classes = StoreApplication.class)
 @RunWith(SpringRunner.class)
 public class ConsistentCheckTest {
     @Autowired