wangli/oss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add(req-2119):下载接口优化

Browse Source
This commit is contained in:
胡朝飞 2024-03-07 10:55:16 +08:00
parent b286e2ddd7
commit ca8cbcd379
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oss-client/src/main/java/cn/axzo/oss/client/controller/ServerFileController.java
View File

@ -105,6 +105,8 @@ public class ServerFileController implements ServerFileServiceApi {
public CommonResponse<DownloadFileFromObsResponse> 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);
}
}

6
oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/HuaWeiCloudServiceImpl.java
View File

@ -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(),

3
oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java
View File

@ -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);
}
}