Merge pull request young-datafan-ooooo1#62 from EchoXiaoLang/feature/…

…minIo-config [ADD]文件管理实现minIo
loamen · Apr 8, 2022 · 2ce47ab · 2ce47ab
2 parents ffa2699 + ff881b1
commit 2ce47ab
Show file tree

Hide file tree

Showing 17 changed files with 648 additions and 158 deletions.
diff --git a/...t-api/src/main/java/com/youngdatafan/dataintegration/file/management/dto/FileSummary.java b/...t-api/src/main/java/com/youngdatafan/dataintegration/file/management/dto/FileSummary.java
@@ -0,0 +1,28 @@
+package com.youngdatafan.dataintegration.file.management.dto;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 文件信息.
+ *
+ * @author songxiaolang
+ * @since 2022-03-30 15:26
+ */
+@Data
+public class FileSummary {
+    /**
+     * 最后修改时间.
+     */
+    private Date lastModified;
+
+    /**
+     * 文件大小.
+     */
+    private long size;
+
+    /**
+     * 文件key.
+     */
+    private String key;
+}
diff --git a/dataintegration-file-management/dataintegration-file-management-provider/pom.xml b/dataintegration-file-management/dataintegration-file-management-provider/pom.xml
@@ -19,6 +19,8 @@
         <poi.version>3.17</poi.version>
         <mysql.version>5.1.47</mysql.version>
         <swagger2.version>3.0.0</swagger2.version>
+        <minio.version>8.3.7</minio.version>
+        <okhttp.version>4.9.0</okhttp.version>
     </properties>
     <dependencies>
 
@@ -213,6 +215,19 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>${minio.version}</version>
+        </dependency>
+        <!-- minio依赖于okhttp3，所以pom文件还需要引入一下okhttp3 -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp.version}</version>
+        </dependency>
+
+
     </dependencies>
 
     <profiles>

diff --git a/...in/java/com/youngdatafan/dataintegration/file/management/config/FileServerProperties.java b/...in/java/com/youngdatafan/dataintegration/file/management/config/FileServerProperties.java
@@ -23,7 +23,7 @@ public class FileServerProperties {
      * 采用的服务器.
      */
     @ApiModelProperty("采用的服务器")
-    private FileServerType useServer;
+    private String useServer;
 
     /**
      * ftp服务器相关属性.
@@ -36,4 +36,10 @@ public class FileServerProperties {
      */
     @ApiModelProperty("s3服务器")
     private S3Properties s3;
+
+    /**
+     * s3服务器相关属性.
+     */
+    @ApiModelProperty("s3服务器")
+    private MinIoProperties minIos3;
 }
diff --git a/...src/main/java/com/youngdatafan/dataintegration/file/management/config/FileServerType.java b/...src/main/java/com/youngdatafan/dataintegration/file/management/config/FileServerType.java
diff --git a/...rc/main/java/com/youngdatafan/dataintegration/file/management/config/MinIoProperties.java b/...rc/main/java/com/youngdatafan/dataintegration/file/management/config/MinIoProperties.java
@@ -0,0 +1,41 @@
+package com.youngdatafan.dataintegration.file.management.config;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * MinIoProperties.
+ *
+ * @author songxiaolang
+ * @since 2022-03-29 14:47
+ */
+@Data
+@ApiModel("MinIo文件服务器")
+public class MinIoProperties {
+
+    /**
+     * minio地址+端口号.
+     */
+    private String url;
+
+    /**
+     * minio用户名.
+     */
+    private String accessKey;
+
+    /**
+     * minio密码.
+     */
+    private String secretKey;
+
+    /**
+     * 文件桶的名称.
+     */
+    private String bucketName;
+
+    /**
+     * 文件根路径名称.
+     */
+    private String rootPath;
+
+}
diff --git a/...afan/dataintegration/file/management/controller/FileContentDetailGetterApiController.java b/...afan/dataintegration/file/management/controller/FileContentDetailGetterApiController.java
@@ -10,6 +10,7 @@
 import com.youngdatafan.dataintegration.file.management.service.DpPortalFileManagerService;
 import com.youngdatafan.dataintegration.file.management.service.FileSystemManagerService;
 import com.youngdatafan.dataintegration.file.management.vo.FileSheetVO;
+import java.io.InputStream;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
@@ -58,20 +59,19 @@ public Result<List<String>, Object> getSheetList(String roleCode, String userId,
         if (!dpPortalFileManager.getFileType().equals("xls") && !dpPortalFileManager.getFileType().equals("xlsx")) {
             return Result.fail(StatusCode.CODE_10010, null, "不是excel文件");
         }
-
-        S3Object fileObject = fileSystemManagerService.getFileObject(dpPortalFileManager.getFilePath());
+        InputStream fileObject = fileSystemManagerService.getFileObject(dpPortalFileManager.getFilePath());
         Workbook workbook = null;
 
         try {
             List<String> sheetList = new ArrayList<>();
-            if (fileObject == null || fileObject.getObjectContent() == null) {
+            if (fileObject == null ) {
                 return Result.fail(StatusCode.CODE_10010, null, "文件不存在");
             }
 
             if (dpPortalFileManager.getFileType().equalsIgnoreCase("xls")) {
-                workbook = new HSSFWorkbook(fileObject.getObjectContent());
+                workbook = new HSSFWorkbook(fileObject);
             } else if (dpPortalFileManager.getFileType().equalsIgnoreCase("xlsx")) {
-                workbook = new XSSFWorkbook(fileObject.getObjectContent());
+                workbook = new XSSFWorkbook(fileObject);
             }
 
             int sheetCnt = workbook.getNumberOfSheets();
@@ -109,20 +109,20 @@ public Result<List<FieldInfoDTO>, Object> fileHeader(String roleCode, String use
             return Result.fail(StatusCode.CODE_10010, null, "文件未找到");
         }
 
-        S3Object fileObject = fileSystemManagerService.getFileObject(dpPortalFileManager.getFilePath());
+        InputStream fileObject = fileSystemManagerService.getFileObject(dpPortalFileManager.getFilePath());
         Workbook workbook = null;
 
         try {
             List<FieldInfoDTO> fieldInfoDTOS = new ArrayList<>();
-            if (fileObject == null || fileObject.getObjectContent() == null) {
+            if (fileObject == null ) {
                 return Result.fail(StatusCode.CODE_10010, null, "文件不存在");
             }
 
             if (dpPortalFileManager.getFileType().equalsIgnoreCase("xls") || dpPortalFileManager.getFileType().equalsIgnoreCase("xlsx")) {
                 if (dpPortalFileManager.getFileType().equalsIgnoreCase("xls")) {
-                    workbook = new HSSFWorkbook(fileObject.getObjectContent());
+                    workbook = new HSSFWorkbook(fileObject);
                 } else if (dpPortalFileManager.getFileType().equalsIgnoreCase("xlsx")) {
-                    workbook = new XSSFWorkbook(fileObject.getObjectContent());
+                    workbook = new XSSFWorkbook(fileObject);
                 }
                 Sheet sheet = workbook.getSheet(sheetName);
                 Row row = sheet.getRow(0);
@@ -178,7 +178,7 @@ public Result<List<FieldInfoDTO>, Object> fileHeader(String roleCode, String use
 
                 }
             } else {
-                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(fileObject.getObjectContent()));
+                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(fileObject));
                 String firstLine = bufferedReader.readLine();
                 String[] fields = firstLine.split(split);
                 for (int i = 0; i < fields.length; i++) {
@@ -228,18 +228,18 @@ public Result<Set<String>, Object> getMoreSheetList(String roleCode, String user
                     return Result.fail(StatusCode.CODE_10010, null, "不是excel文件");
                 }
 
-                S3Object fileObject = fileSystemManagerService.getFileObject(dpPortalFileManager.getFilePath());
+                InputStream fileObject = fileSystemManagerService.getFileObject(dpPortalFileManager.getFilePath());
                 Workbook workbook = null;
 
                 try {
-                    if (fileObject == null || fileObject.getObjectContent() == null) {
+                    if (fileObject == null ) {
                         return Result.fail(StatusCode.CODE_10010, null, "文件不存在");
                     }
 
                     if (dpPortalFileManager.getFileType().equalsIgnoreCase("xls")) {
-                        workbook = new HSSFWorkbook(fileObject.getObjectContent());
+                        workbook = new HSSFWorkbook(fileObject);
                     } else if (dpPortalFileManager.getFileType().equalsIgnoreCase("xlsx")) {
-                        workbook = new XSSFWorkbook(fileObject.getObjectContent());
+                        workbook = new XSSFWorkbook(fileObject);
                     }
 
                     int sheetCnt = workbook.getNumberOfSheets();