diff --git a/file-common/src/main/java/com/qiwenshare/common/domain/DownloadFile.java b/file-common/src/main/java/com/qiwenshare/common/domain/DownloadFile.java index b66cba6..357bf4e 100644 --- a/file-common/src/main/java/com/qiwenshare/common/domain/DownloadFile.java +++ b/file-common/src/main/java/com/qiwenshare/common/domain/DownloadFile.java @@ -5,5 +5,5 @@ import lombok.Data; @Data public class DownloadFile { private String fileUrl; - private String timeStampName; +// private String timeStampName; } diff --git a/file-common/src/main/java/com/qiwenshare/common/operation/download/product/AliyunOSSDownloader.java b/file-common/src/main/java/com/qiwenshare/common/operation/download/product/AliyunOSSDownloader.java index acdb989..3773310 100644 --- a/file-common/src/main/java/com/qiwenshare/common/operation/download/product/AliyunOSSDownloader.java +++ b/file-common/src/main/java/com/qiwenshare/common/operation/download/product/AliyunOSSDownloader.java @@ -27,7 +27,8 @@ public class AliyunOSSDownloader extends Downloader { byte[] buffer = new byte[1024]; OSS ossClient = createOSSClient(qiwenFileConfig.getAliyun().getOss()); - OSSObject ossObject = ossClient.getObject(qiwenFileConfig.getAliyun().getOss().getBucketName(), downloadFile.getTimeStampName()); + OSSObject ossObject = ossClient.getObject(qiwenFileConfig.getAliyun().getOss().getBucketName(), + downloadFile.getFileUrl().substring(1)); InputStream inputStream = ossObject.getObjectContent(); try { bis = new BufferedInputStream(inputStream); diff --git a/file-common/src/main/java/com/qiwenshare/common/operation/upload/product/LocalStorageUploader.java b/file-common/src/main/java/com/qiwenshare/common/operation/upload/product/LocalStorageUploader.java index b9e5295..b5c1353 100644 --- a/file-common/src/main/java/com/qiwenshare/common/operation/upload/product/LocalStorageUploader.java +++ b/file-common/src/main/java/com/qiwenshare/common/operation/upload/product/LocalStorageUploader.java @@ -46,14 +46,14 @@ public class LocalStorageUploader extends Uploader { if (!isMultipart) { throw new UploadGeneralException("未包含文件上传域"); } - DiskFileItemFactory dff = new DiskFileItemFactory();//1、创建工厂 + //DiskFileItemFactory dff = new DiskFileItemFactory();//1、创建工厂 String savePath = getSaveFilePath(); - dff.setRepository(new File(savePath)); + //dff.setRepository(new File(savePath)); try { - ServletFileUpload sfu = new ServletFileUpload(dff);//2、创建文件上传解析器 - sfu.setSizeMax(this.maxSize * 1024L); - sfu.setHeaderEncoding("utf-8");//3、解决文件名的中文乱码 + //ServletFileUpload sfu = new ServletFileUpload(dff);//2、创建文件上传解析器 + //sfu.setSizeMax(this.maxSize * 1024L); + // sfu.setHeaderEncoding("utf-8");//3、解决文件名的中文乱码 Iterator iter = standardMultipartHttpServletRequest.getFileNames(); while (iter.hasNext()) { saveUploadFileList = doUpload(standardMultipartHttpServletRequest, savePath, iter, uploadFile); diff --git a/file-web/src/main/java/com/qiwenshare/file/service/FiletransferService.java b/file-web/src/main/java/com/qiwenshare/file/service/FiletransferService.java index 2aa8806..88bfb6e 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/FiletransferService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/FiletransferService.java @@ -146,7 +146,7 @@ public class FiletransferService implements IFiletransferService { } DownloadFile uploadFile = new DownloadFile(); uploadFile.setFileUrl(fileBean.getFileUrl()); - uploadFile.setTimeStampName(fileBean.getTimeStampName()); +// uploadFile.setTimeStampName(fileBean.getTimeStampName()); downloader.download(httpServletResponse, uploadFile); }