diff --git a/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java b/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java index 97ca2d5..10ea556 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java @@ -105,6 +105,8 @@ public class ServerFileController implements ServerFileServiceApi { public CommonResponse downloadFileFromOBS(@Valid @RequestBody DownloadFileFromObsRequest request) { ServerFileDownloadDto serverFileDownloadDto = BeanConvertUtil.copyBean(request, ServerFileDownloadDto.class); ServerFileDownloadResponse res = fileService.getObject(serverFileDownloadDto, request.getFileDownloadType()); - return CommonResponse.success(BeanConverter.convert(res, DownloadFileFromObsResponse.class)); + DownloadFileFromObsResponse result = BeanConverter.convert(res, DownloadFileFromObsResponse.class); + result.setFileStream(res.getFileStream()); + return CommonResponse.success(result); } } diff --git a/oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/HuaWeiCloudServiceImpl.java b/oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/HuaWeiCloudServiceImpl.java index 703e4fb..194e3cc 100644 --- a/oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/HuaWeiCloudServiceImpl.java +++ b/oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/HuaWeiCloudServiceImpl.java @@ -244,9 +244,10 @@ public class HuaWeiCloudServiceImpl implements HuaWeiCloudService { request.setObjectKey(objectKey); ObsObject object = obsClient.getObject(request); + log.info("下载华为云OBS文件成功"); return object.getObjectContent(); } catch (ObsException obsException) { - log.info("下载华为云OBS文件失败,HTTP Code:{}, Error Code:{}, Request ID:{}, Host ID:{}, Error Message:{}", + log.warn("下载华为云OBS文件失败,HTTP Code:{}, Error Code:{}, Request ID:{}, Host ID:{}, Error Message:{}", obsException.getResponseCode(), obsException.getErrorCode(), obsException.getErrorRequestId(), @@ -269,10 +270,11 @@ public class HuaWeiCloudServiceImpl implements HuaWeiCloudService { DownloadFileResult downloadFileResult = obsClient.downloadFile(request); String etag = downloadFileResult.getObjectMetadata().getEtag(); + log.info("下载华为云OBS文件成功"); } catch (NumberFormatException e) { throw new RuntimeException(e); } catch (ObsException obsException) { - log.info("下载华为云OBS文件失败,HTTP Code:{}, Error Code:{}, Request ID:{}, Host ID:{}, Error Message:{}", + log.warn("下载华为云OBS文件失败,HTTP Code:{}, Error Code:{}, Request ID:{}, Host ID:{}, Error Message:{}", obsException.getResponseCode(), obsException.getErrorCode(), obsException.getErrorRequestId(), diff --git a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java index 467c2fc..e219a9a 100644 --- a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java +++ b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java @@ -718,6 +718,9 @@ public class FileServiceImpl implements FileService { // 桶名称 String bucketName = file.getBucketName(); InputStream fileStream = fileManager.downloadObsFile(bucketName, objectKey, fileDownloadType); + if (Objects.isNull(fileStream)) { + log.warn("下载的文件流为空"); + } return setFileDownloadResponse(file, fileStream); } }