diff --git a/src/main/java/com/ai/da/service/upload/UploadService.java b/src/main/java/com/ai/da/service/upload/UploadService.java index 0d051385..777495fe 100644 --- a/src/main/java/com/ai/da/service/upload/UploadService.java +++ b/src/main/java/com/ai/da/service/upload/UploadService.java @@ -3,6 +3,7 @@ package com.ai.da.service.upload; import com.ai.da.model.dto.*; import org.springframework.web.multipart.MultipartFile; + /** * 分片上传服务接口 * 提供PDF和视频文件的分片上传、断点续传功能 diff --git a/src/main/java/com/ai/da/service/upload/UploadTask.java b/src/main/java/com/ai/da/service/upload/UploadTask.java index 825e1e62..260bd3e2 100644 --- a/src/main/java/com/ai/da/service/upload/UploadTask.java +++ b/src/main/java/com/ai/da/service/upload/UploadTask.java @@ -88,6 +88,11 @@ public class UploadTask { */ UPLOADING, + /** + * 正在处理文件(合并分片、上传到存储) + */ + PROCESSING, + /** * 上传完成 */ diff --git a/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java b/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java index 54788c42..a2659459 100644 --- a/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java +++ b/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java @@ -59,8 +59,7 @@ public class UploadServiceImpl implements UploadService { @Resource private MinioUtil minioUtil; - - @Value("${minio.bucket:contestants}") + @Value("${minio.bucketName:globalAward}") private String minioBucket; // 内存存储上传任务状态 @@ -116,7 +115,6 @@ public class UploadServiceImpl implements UploadService { } @Override - @Async public UploadCompleteResponse completePdfUpload(String uploadId, String fileName, long totalSize) { UploadTask task = validateAndGetTask(uploadId, "pdf"); @@ -220,7 +218,6 @@ public class UploadServiceImpl implements UploadService { } @Override - @Async public UploadCompleteResponse completeVideoUpload(String uploadId, String fileName, long totalSize) { UploadTask task = validateAndGetTask(uploadId, "video"); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index d23cd6dd..543387a9 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -63,6 +63,7 @@ minio.bucketName.gradient=aida-gradient minio.bucketName.modifiedSketch=aida-modified-sketch minio.bucketName.slogan=aida-slogan minio.bucketName.partialDesign=aida-partial-design +minio.bucketName.globalAward=global-award redirect_url=http://18.167.251.121:7788 spring.rabbitmq.host=18.167.251.121 @@ -180,6 +181,4 @@ file.upload.max.size.video=104857600 # 上传任务过期时间(小时) file.upload.task.expiry.hours=24 -# MinIO配置 -minio.bucket=contestants global.award.link=https://develop.aida.com.hk/ \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 78d02adb..28080ddf 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -63,6 +63,7 @@ minio.bucketName.gradient=aida-gradient minio.bucketName.modifiedSketch=aida-modified-sketch minio.bucketName.slogan=aida-slogan minio.bucketName.partialDesign=aida-partial-design +minio.bucketName.globalAward=global-award redirect_url=http://18.167.251.121:7788 spring.rabbitmq.host=18.167.251.121 @@ -178,6 +179,4 @@ file.upload.max.size.video=104857600 # 上传任务过期时间(小时) file.upload.task.expiry.hours=24 -# MinIO配置 -minio.bucket=contestants global.award.link=https://www.aida.com.hk/ \ No newline at end of file