ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oss上传url错误修复

Browse Source
This commit is contained in:
马超 2021-04-02 00:10:09 +08:00
parent c41f76a2aa
commit add805da09
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
file-common/src/main/java/com/qiwenshare/common/operation/upload/product/AliyunOSSUploader.java
View File

@ -11,6 +11,7 @@ import com.qiwenshare.common.operation.upload.Uploader;
import com.qiwenshare.common.util.FileUtil; import com.qiwenshare.common.util.FileUtil;
import com.qiwenshare.common.util.PathUtil; import com.qiwenshare.common.util.PathUtil;
import lombok.Data; import lombok.Data;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -22,6 +23,7 @@ import org.springframework.web.multipart.support.StandardMultipartHttpServletReq
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.File; import java.io.File;
import java.io.InputStream;
import java.util.*; import java.util.*;
@Component @Component
public class AliyunOSSUploader extends Uploader { public class AliyunOSSUploader extends Uploader {
@ -29,6 +31,7 @@ public class AliyunOSSUploader extends Uploader {
@Resource @Resource
QiwenFileConfig qiwenFileConfig; QiwenFileConfig qiwenFileConfig;
// partETags是PartETag的集合。PartETag由分片的ETag和分片号组成。 // partETags是PartETag的集合。PartETag由分片的ETag和分片号组成。
public static Map<String, List<PartETag>> partETagsMap = new HashMap<String, List<PartETag>>(); public static Map<String, List<PartETag>> partETagsMap = new HashMap<String, List<PartETag>>();
public static Map<String, UploadFileInfo> uploadPartRequestMap = new HashMap<>(); public static Map<String, UploadFileInfo> uploadPartRequestMap = new HashMap<>();
@ -53,6 +56,7 @@ public class AliyunOSSUploader extends Uploader {
saveUploadFileList = doUpload(request, iter, uploadFile); saveUploadFileList = doUpload(request, iter, uploadFile);
} }
logger.info("结束上传"); logger.info("结束上传");
return saveUploadFileList; return saveUploadFileList;
} }
@ -123,6 +127,9 @@ public class AliyunOSSUploader extends Uploader {
uploadFile.setUrl("/" + uploadPartRequestMap.get(uploadFile.getIdentifier()).getKey()); uploadFile.setUrl("/" + uploadPartRequestMap.get(uploadFile.getIdentifier()).getKey());
uploadFile.setSuccess(1); uploadFile.setSuccess(1);
uploadFile.setMessage("上传成功"); uploadFile.setMessage("上传成功");
partETagsMap.remove(uploadFile.getIdentifier());
uploadPartRequestMap.remove(uploadFile.getIdentifier());
ossMap.remove(uploadFile.getIdentifier());
} else { } else {
uploadFile.setSuccess(0); uploadFile.setSuccess(0);
uploadFile.setMessage("未完成"); uploadFile.setMessage("未完成");
@ -159,9 +166,7 @@ public class AliyunOSSUploader extends Uploader {
CompleteMultipartUploadResult completeMultipartUploadResult = getClient(uploadFile).completeMultipartUpload(completeMultipartUploadRequest); CompleteMultipartUploadResult completeMultipartUploadResult = getClient(uploadFile).completeMultipartUpload(completeMultipartUploadRequest);
logger.info("----:" + JSON.toJSONString(completeMultipartUploadRequest)); logger.info("----:" + JSON.toJSONString(completeMultipartUploadRequest));
getClient(uploadFile).shutdown(); getClient(uploadFile).shutdown();
partETagsMap.remove(uploadFile.getIdentifier());
uploadPartRequestMap.remove(uploadFile.getIdentifier());
ossMap.remove(uploadFile.getIdentifier());
// //
} }