diff --git a/oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/AliOssServiceImpl.java b/oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/AliOssServiceImpl.java index 9c9e85d..1675b53 100644 --- a/oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/AliOssServiceImpl.java +++ b/oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/AliOssServiceImpl.java @@ -399,8 +399,7 @@ public class AliOssServiceImpl implements AliOssService { @Override public String uploadByUrl(String bucketName, String tgtFileKey, String fileName, String url) { OSS client = aliOssClient.getClient(); - try { - InputStream srcStream = new URL(url).openStream(); + try(InputStream srcStream = new URL(url).openStream()) { // 创建上传文件的元信息,通过文件云信息设置HTTP Header ObjectMetadata metadata = new ObjectMetadata(); // 设置内容被下载时的名称 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 ca562c1..a829537 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 @@ -438,8 +438,7 @@ public class HuaWeiCloudServiceImpl implements HuaWeiCloudService { @Override public String uploadFileByUrl(String bucketName, String key, String fileName, String url) { ObsClient obsClient = huaWeiCloudObsClient.getClient(); - try { - InputStream srcStream = new URL(url).openStream(); + try (InputStream srcStream = new URL(url).openStream()) { // 创建上传文件的元信息,通过文件云信息设置HTTP Header ObjectMetadata metadata = new ObjectMetadata(); // 设置内容被下载时的名称 diff --git a/oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java b/oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java index ae55f60..034b8af 100644 --- a/oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java +++ b/oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java @@ -232,8 +232,10 @@ public class FileManagerImpl implements FileManager { switch (typeEnum) { case OBS:// 华为云 huaWeiCloudService.deleteFile(bucketName, key); + break; case OSS:// 阿里云 aliOssService.deleteFile(bucketName, key); + break; default: BizException.error(CodeEnum.CHANNEL_TYPE_NOT_EXIST); } diff --git a/oss-service/src/test/java/cn/axzo/oss/test/FileServiceTest.java b/oss-service/src/test/java/cn/axzo/oss/test/FileServiceTest.java index 1b52bdb..1098b4d 100644 --- a/oss-service/src/test/java/cn/axzo/oss/test/FileServiceTest.java +++ b/oss-service/src/test/java/cn/axzo/oss/test/FileServiceTest.java @@ -40,11 +40,8 @@ public class FileServiceTest extends SpringTestBase { File file = new File("/Users/admin/Downloads/表扬人员名称.xlsx"); - FileInputStream fileInputStream = null; - byte[] bytes = new byte[(int) file.length()]; - try { - fileInputStream = new FileInputStream(file); + try (FileInputStream fileInputStream = new FileInputStream(file)) { fileInputStream.read(bytes); } catch (FileNotFoundException e) { e.printStackTrace();