From add805da0948c091c2e456171f0b2856ed6a5e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Fri, 2 Apr 2021 00:10:09 +0800 Subject: [PATCH] =?UTF-8?q?oss=E4=B8=8A=E4=BC=A0url=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/upload/product/AliyunOSSUploader.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/file-common/src/main/java/com/qiwenshare/common/operation/upload/product/AliyunOSSUploader.java b/file-common/src/main/java/com/qiwenshare/common/operation/upload/product/AliyunOSSUploader.java index ae35397..a330506 100644 --- a/file-common/src/main/java/com/qiwenshare/common/operation/upload/product/AliyunOSSUploader.java +++ b/file-common/src/main/java/com/qiwenshare/common/operation/upload/product/AliyunOSSUploader.java @@ -11,6 +11,7 @@ import com.qiwenshare.common.operation.upload.Uploader; import com.qiwenshare.common.util.FileUtil; import com.qiwenshare.common.util.PathUtil; import lombok.Data; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -22,6 +23,7 @@ import org.springframework.web.multipart.support.StandardMultipartHttpServletReq import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.File; +import java.io.InputStream; import java.util.*; @Component public class AliyunOSSUploader extends Uploader { @@ -29,6 +31,7 @@ public class AliyunOSSUploader extends Uploader { @Resource QiwenFileConfig qiwenFileConfig; + // partETags是PartETag的集合。PartETag由分片的ETag和分片号组成。 public static Map> partETagsMap = new HashMap>(); public static Map uploadPartRequestMap = new HashMap<>(); @@ -53,6 +56,7 @@ public class AliyunOSSUploader extends Uploader { saveUploadFileList = doUpload(request, iter, uploadFile); } + logger.info("结束上传"); return saveUploadFileList; } @@ -123,6 +127,9 @@ public class AliyunOSSUploader extends Uploader { uploadFile.setUrl("/" + uploadPartRequestMap.get(uploadFile.getIdentifier()).getKey()); uploadFile.setSuccess(1); uploadFile.setMessage("上传成功"); + partETagsMap.remove(uploadFile.getIdentifier()); + uploadPartRequestMap.remove(uploadFile.getIdentifier()); + ossMap.remove(uploadFile.getIdentifier()); } else { uploadFile.setSuccess(0); uploadFile.setMessage("未完成"); @@ -159,9 +166,7 @@ public class AliyunOSSUploader extends Uploader { CompleteMultipartUploadResult completeMultipartUploadResult = getClient(uploadFile).completeMultipartUpload(completeMultipartUploadRequest); logger.info("----:" + JSON.toJSONString(completeMultipartUploadRequest)); getClient(uploadFile).shutdown(); - partETagsMap.remove(uploadFile.getIdentifier()); - uploadPartRequestMap.remove(uploadFile.getIdentifier()); - ossMap.remove(uploadFile.getIdentifier()); + // }