martin 3 gadi atpakaļ
vecāks
revīzija
6bc9a9c2d3

+ 0 - 2
api-common/src/main/java/api/common/pojo/param/MinioParameter.java

@@ -10,8 +10,6 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 @AllArgsConstructor
 public class MinioParameter {
-    @NotBlank(message ="bucket 名称不能为空!")
-    private String bucketName;
     @NotBlank(message ="object 名称不能为空!")
     private String objectName;
 }

+ 5 - 2
simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/MinioController.java

@@ -6,6 +6,7 @@ import api.common.util.FileUtil;
 import com.css.simulation.resource.common.util.MinioUtil;
 import io.minio.MinioClient;
 import io.minio.errors.*;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,9 @@ public class MinioController {
     @Resource
     private MinioClient minioClient;
 
+    @Value("${oauth.bucket-name}")
+    private String bucketName;
+
 
     @PostMapping("/hello")
     public String hello() {
@@ -34,7 +38,6 @@ public class MinioController {
     @PostMapping(value="/upload",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseBodyVO<String> upload(
             @RequestPart("file") MultipartFile file,
-            @RequestParam("bucketName") String bucketName,
             @RequestParam("objectName") String objectName//  "/xx/xxx/x/xx"
     ) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
         MinioUtil.uploadFromMultipartFile(
@@ -53,7 +56,7 @@ public class MinioController {
     ) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
         InputStream inputStream = MinioUtil.downloadToStream(
                 minioClient,
-                minioParameter.getBucketName(),
+                bucketName,
                 minioParameter.getObjectName()
         );
         String fileName = FileUtil.getFileName(minioParameter.getObjectName());