diff --git a/virtual-patient-common/src/main/java/com/supervision/util/MinioUtil.java b/virtual-patient-common/src/main/java/com/supervision/util/MinioUtil.java index 69566704..d092fb38 100644 --- a/virtual-patient-common/src/main/java/com/supervision/util/MinioUtil.java +++ b/virtual-patient-common/src/main/java/com/supervision/util/MinioUtil.java @@ -6,6 +6,7 @@ import io.minio.http.Method; import lombok.extern.slf4j.Slf4j; import java.io.InputStream; +import java.util.UUID; @Slf4j public class MinioUtil { @@ -29,9 +30,9 @@ public class MinioUtil { /** * 上传一个文件 */ - public static String uploadFile(InputStream stream, String objectName) throws Exception { - ObjectWriteResponse objectWriteResponse = minioClient.putObject(PutObjectArgs.builder().bucket(bucketName).object(objectName) - .stream(stream, -1, 10485760).build()); + public static String uploadFile(InputStream stream) throws Exception { + ObjectWriteResponse objectWriteResponse = minioClient.putObject(PutObjectArgs.builder().bucket(bucketName).object(UUID.randomUUID().toString()) + .stream(stream, stream.available(), -1).build()); return objectWriteResponse.object(); } @@ -43,7 +44,6 @@ public class MinioUtil { } - /** * 删除一个对象 */ @@ -52,8 +52,6 @@ public class MinioUtil { } - - /** * 获取文件信息 * @@ -81,5 +79,4 @@ public class MinioUtil { } - } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/TestController.java b/virtual-patient-web/src/main/java/com/supervision/controller/TestController.java index 02bb9969..0fe64c12 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/TestController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/TestController.java @@ -93,7 +93,7 @@ public class TestController { @PostMapping("testFileUpload") public String testFileUpload(MultipartFile file) throws Exception { - return MinioUtil.uploadFile(file.getInputStream(), UUID.randomUUID().toString()); + return MinioUtil.uploadFile(file.getInputStream()); } @PostMapping("downloadFile") diff --git a/virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java b/virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java index ad1ed778..757e1fbb 100644 --- a/virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java +++ b/virtual-patient-web/src/test/java/com/supervision/VideoUpdateTest.java @@ -34,10 +34,10 @@ public class VideoUpdateTest { @Autowired private AskPatientAnswerService askPatientAnswerService; + private String filePath = "/Users/flevance/Desktop/虚拟病人/语料库/video_texts/"; @Test public void saveDefaultAnswerVideo() throws Exception { - String filePath = "/Users/flevance/Desktop/虚拟病人/语料库/video_texts/"; List list = askTemplateQuestionLibraryService.list(); for (AskTemplateQuestionLibrary library : list) { String defaultAnswerCode = library.getDefaultAnswerCode(); @@ -50,7 +50,7 @@ public class VideoUpdateTest { BufferedInputStream inputStream = FileUtil.getInputStream(file); fileResource.setFileSize(inputStream.available()); - String minioId = MinioUtil.uploadFile(inputStream, defaultAnswerCode); + String minioId = MinioUtil.uploadFile(inputStream); fileResource.setMinioId(minioId); fileResource.insert(); askTemplateQuestionLibraryService.lambdaUpdate() @@ -66,7 +66,6 @@ public class VideoUpdateTest { @Test public void saveDiseaseVideo() throws Exception { - String filePath = "/Users/flevance/Desktop/虚拟病人/语料库/video_texts/"; List list = askPatientAnswerService.list(); for (AskPatientAnswer answer : list) { String code = answer.getCode(); @@ -79,7 +78,7 @@ public class VideoUpdateTest { BufferedInputStream inputStream = FileUtil.getInputStream(file); fileResource.setFileSize(inputStream.available()); - String minioId = MinioUtil.uploadFile(inputStream, code); + String minioId = MinioUtil.uploadFile(inputStream); fileResource.setMinioId(minioId); fileResource.insert(); askPatientAnswerService.lambdaUpdate()