fix: 在MinioService注入的时候，默认不创建存储桶。在上传文件时按日期（yyyy-MM-dd）格式来存储文件

xp.Huang
1 parent 94f0dec9
Showing 3 changed files with 60 additions and 42 deletions
application/src/main/resources/thingsboard.yml
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/utils/MinioFileStorageService.java
--- a/application/src/main/resources/thingsboard.yml
View file @0c13553
+++ b/application/src/main/resources/thingsboard.yml
View file @0c13553
@@ -1188,7 +1188,7 @@ file:
     randomFileName: true                  #是否重命名文件名字，防止冲突
     local:
       uploadDir: /Users/thingskit/upload/     #文件上传地址 只有type = local需要
-      downloadPath: /downloadFile/          #与controller里面下载文件GetMapping的path一致, 只有type = local需要
+      downloadPath: /download_file/      #与controller里面下载文件GetMapping的path一致, 只有type = local需要
       uploadPath: /upload                   #与controller里面下载文件GetMapping的path一致, 只有type = local需要
       staticUrl: /oss/files/**              #oss静态访问路径 只有type = local需要
       randomFileName: ${file.storage.randomFileName}
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @0c13553
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @0c13553
@@ -87,6 +87,8 @@ public enum ErrorMessage {
   DUPLICATE_IDENTIFIERS_EXIST(400063,"存在重复的功能标识符。"),
   SMS_CONFIG_ERROR(400064,"短信配置错误。"),
   INVALID_TOPIC(400065,"无效Topic。"),
+  BUCKET_NOT_CONFORM_RENAME_RULE(400066,"存储桶不符合命名规范！！"),
+  MINIO_KEY_AND_SIGNATURE_ERROR(400067,"Minio签名不匹配！！"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/utils/MinioFileStorageService.java
View file @0c13553
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/utils/MinioFileStorageService.java
View file @0c13553
@@ -17,12 +17,14 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 import org.thingsboard.server.common.data.yunteng.core.exception.FileStorageException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 import javax.net.ssl.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -31,6 +33,8 @@ import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 @Service
@@ -50,10 +54,8 @@ public class MinioFileStorageService implements FileStorageService {
         MinioClient.builder()
             .endpoint(fileStorageProperties.getMinioUrl())
             .credentials(fileStorageProperties.getMinioName(), fileStorageProperties.getMinioPass())
-            .httpClient(getUnsafeOkHttpClient())
+            .httpClient(Objects.requireNonNull(getUnsafeOkHttpClient()))
             .build();
-    // 创建储存桶
-    checkBucket();
   }
   public static OkHttpClient getUnsafeOkHttpClient() throws KeyManagementException {
@@ -94,12 +96,22 @@ public class MinioFileStorageService implements FileStorageService {
     // Normalize file name
     String fileName = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
     // random fileName if needed
+
     // 储存
     try {
       return storeFileByInputStream(fileName, file.getContentType(), file.getInputStream());
-    } catch (Exception ex) {
-      ex.printStackTrace();
+    } catch (IOException ex) {
       throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
+    } catch (TkDataValidationException
+        | ServerException
+        | InsufficientDataException
+        | ErrorResponseException
+        | NoSuchAlgorithmException
+        | InvalidKeyException
+        | InvalidResponseException
+        | XmlParserException
+        | InternalException e) {
+      throw new TkDataValidationException(e.getMessage());
     }
   }
@@ -107,18 +119,14 @@ public class MinioFileStorageService implements FileStorageService {
   public FileUploadResponse upload(MultipartFile file) {
     String fileName = this.storeFile(file);
     String staticPath = getPath(fileName);
-    String realDownloadPath = null;
-    try {
-      // 获取request
-      HttpServletRequest request =
-          ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-      // 生成下载接口的地址
-      realDownloadPath =
-          request.getRequestURL().toString().replace("upload", "downloadFile/" + fileName);
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.info("Could not upload file " + fileName + ". Please try again!");
-    }
+    // 获取request
+    HttpServletRequest request =
+        ((ServletRequestAttributes)
+                Objects.requireNonNull(RequestContextHolder.getRequestAttributes()))
+            .getRequest();
+    // 生成下载接口的地址
+    String realDownloadPath =
+        request.getRequestURL().toString().replace("upload", "downloadFile/" + fileName);
     return new FileUploadResponse(
         fileName, realDownloadPath, file.getContentType(), file.getSize(), staticPath);
   }
@@ -165,29 +173,29 @@ public class MinioFileStorageService implements FileStorageService {
     }
   }
-  // 检查储存桶情况
-  private void checkBucket() {
-    try {
-      // 桶是否存在
-      boolean exists =
-          minioClient.bucketExists(
-              BucketExistsArgs.builder().bucket(fileStorageProperties.getBucketName()).build());
-      if (!exists) {
-        // 不存在创建
-        minioClient.makeBucket(
-            MakeBucketArgs.builder().bucket(fileStorageProperties.getBucketName()).build());
-        // 设置储存桶策略
-        String str =
-            "{\"Statement\": [{\"Action\": [\"s3:GetBucketLocation\",\"s3:ListBucket\"],\"Effect\": \"Allow\",\"Principal\": \"*\",\"Resource\": \"arn:aws:s3:::%\"},{\"Action\": \"s3:GetObject\",\"Effect\": \"Allow\",\"Principal\": \"*\",\"Resource\": \"arn:aws:s3:::%/*\"}],\"Version\": \"2012-10-17\"}";
-        String replace = str.replace("%", fileStorageProperties.getBucketName());
-        minioClient.setBucketPolicy(
-            SetBucketPolicyArgs.builder()
-                .bucket(fileStorageProperties.getBucketName())
-                .config(replace)
-                .build());
-      }
-    } catch (Exception e) {
-      log.error(e.getMessage(), e);
+  private void checkBucket()
+      throws ServerException, InsufficientDataException, ErrorResponseException, IOException,
+          NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException,
+          XmlParserException, InternalException {
+    String bucketName = fileStorageProperties.getBucketName();
+    // 桶是否存在
+    boolean exists =
+        minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
+    if (!exists) {
+      // 不存在创建
+      minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
+      // 设置储存桶策略
+      String str =
+          "{\"Statement\": [{\"Action\": [\"s3:GetBucketLocation\",\"s3:ListBucket\"],"
+              + "\"Effect\": \"Allow\",\"Principal\": \"*\",\"Resource\": \"arn:aws:s3:::%\"},{\"Action\": "
+              + "\"s3:GetObject\",\"Effect\": \"Allow\",\"Principal\": \"*\","
+              + "\"Resource\": \"arn:aws:s3:::%/*\"}],\"Version\": \"2012-10-17\"}";
+      String replace = str.replace("%", fileStorageProperties.getBucketName());
+      minioClient.setBucketPolicy(
+          SetBucketPolicyArgs.builder()
+              .bucket(fileStorageProperties.getBucketName())
+              .config(replace)
+              .build());
     }
   }
@@ -222,7 +230,15 @@ public class MinioFileStorageService implements FileStorageService {
     if (fileName.contains("..")) {
       throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
     }
-    checkBucket();
+    try {
+      checkBucket();
+    } catch (ErrorResponseException e) {
+      throw new TkDataValidationException(ErrorMessage.MINIO_KEY_AND_SIGNATURE_ERROR.getMessage());
+    } catch (Exception e) {
+      throw new TkDataValidationException(ErrorMessage.BUCKET_NOT_CONFORM_RENAME_RULE.getMessage());
+    }
+    String date = LocalDateTime.now().format(DateTimeFormatter.ISO_DATE);
+    fileName = date + "/" + fileName;
     PutObjectArgs build =
         PutObjectArgs.builder()
             .bucket(fileStorageProperties.getBucketName())