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

Merge branch 'feature/fix-sonar-issue-07-01' into 'master'

Browse Source 
sonar-fix

See merge request universal/infrastructure/backend/oss!152
This commit is contained in:
徐大伟 2024-07-03 05:40:48 +00:00
commit 8f4748e3de
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oss-integration/src/main/java/cn/axzo/oss/integration/s3/impl/AliOssServiceImpl.java
View File

@ -399,8 +399,7 @@ public class AliOssServiceImpl implements AliOssService {
@Override @Override
public String uploadByUrl(String bucketName, String tgtFileKey, String fileName, String url) { public String uploadByUrl(String bucketName, String tgtFileKey, String fileName, String url) {
OSS client = aliOssClient.getClient(); OSS client = aliOssClient.getClient();
try { try(InputStream srcStream = new URL(url).openStream()) {
InputStream srcStream = new URL(url).openStream();
// 创建上传文件的元信息，通过文件云信息设置HTTP Header // 创建上传文件的元信息，通过文件云信息设置HTTP Header
ObjectMetadata metadata = new ObjectMetadata(); ObjectMetadata metadata = new ObjectMetadata();
// 设置内容被下载时的名称 // 设置内容被下载时的名称

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

@ -438,8 +438,7 @@ public class HuaWeiCloudServiceImpl implements HuaWeiCloudService {
@Override @Override
public String uploadFileByUrl(String bucketName, String key, String fileName, String url) { public String uploadFileByUrl(String bucketName, String key, String fileName, String url) {
ObsClient obsClient = huaWeiCloudObsClient.getClient(); ObsClient obsClient = huaWeiCloudObsClient.getClient();
try { try (InputStream srcStream = new URL(url).openStream()) {
InputStream srcStream = new URL(url).openStream();
// 创建上传文件的元信息，通过文件云信息设置HTTP Header // 创建上传文件的元信息，通过文件云信息设置HTTP Header
ObjectMetadata metadata = new ObjectMetadata(); ObjectMetadata metadata = new ObjectMetadata();
// 设置内容被下载时的名称 // 设置内容被下载时的名称

2
oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java
View File

@ -232,8 +232,10 @@ public class FileManagerImpl implements FileManager {
switch (typeEnum) { switch (typeEnum) {
case OBS:// 华为云 case OBS:// 华为云
huaWeiCloudService.deleteFile(bucketName, key); huaWeiCloudService.deleteFile(bucketName, key);
break;
case OSS:// 阿里云 case OSS:// 阿里云
aliOssService.deleteFile(bucketName, key); aliOssService.deleteFile(bucketName, key);
break;
default: default:
BizException.error(CodeEnum.CHANNEL_TYPE_NOT_EXIST); BizException.error(CodeEnum.CHANNEL_TYPE_NOT_EXIST);
} }

5
oss-service/src/test/java/cn/axzo/oss/test/FileServiceTest.java
View File

@ -40,11 +40,8 @@ public class FileServiceTest extends SpringTestBase {
File file = new File("/Users/admin/Downloads/表扬人员名称.xlsx"); File file = new File("/Users/admin/Downloads/表扬人员名称.xlsx");
FileInputStream fileInputStream = null;
byte[] bytes = new byte[(int) file.length()]; byte[] bytes = new byte[(int) file.length()];
try { try (FileInputStream fileInputStream = new FileInputStream(file)) {
fileInputStream = new FileInputStream(file);
fileInputStream.read(bytes); fileInputStream.read(bytes);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();