|
@@ -169,15 +169,34 @@ public class UploadToOssUtil {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public void uploadOss(byte[] data,String key1){
|
|
|
+ public void uploadOss(byte[] data,String objectName){
|
|
|
OSSClient ossClient = new OSSClient(point, key, secrey);
|
|
|
try {
|
|
|
- ossClient.putObject(bucket, key1, new ByteArrayInputStream(data));
|
|
|
+ ossClient.putObject(bucket, objectName, new ByteArrayInputStream(data));
|
|
|
} catch (Exception e) {
|
|
|
- log.error(e.toString()+key1);
|
|
|
+ log.error("oss上传文件失败", e);
|
|
|
+ }finally {
|
|
|
+ if(ossClient != null){
|
|
|
+ ossClient.shutdown();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- public void uploadAws(byte[] data,String key1){
|
|
|
+ public void uploadAws(byte[] data,String objectName){
|
|
|
+ BasicAWSCredentials awsCreds = new BasicAWSCredentials(s3key, s3secrey);
|
|
|
+ AmazonS3 s3 = AmazonS3ClientBuilder.standard()
|
|
|
+ .withCredentials(new AWSStaticCredentialsProvider(awsCreds))
|
|
|
+ .withRegion(Regions.EU_WEST_2)
|
|
|
+ .build();
|
|
|
+ try {
|
|
|
+ com.amazonaws.services.s3.model.ObjectMetadata metadata = new com.amazonaws.services.s3.model.ObjectMetadata();
|
|
|
+ s3.putObject(this.bucket, objectName, new ByteArrayInputStream(data), metadata);
|
|
|
+ }catch (Exception e){
|
|
|
+ log.error("s3上传文件失败", e);
|
|
|
+ }finally {
|
|
|
+ if(s3 != null){
|
|
|
+ s3.shutdown();
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
public void uploadLocal(byte[] data,String key1){
|
|
|
InputStream in = new ByteArrayInputStream(data);
|
|
@@ -878,10 +897,18 @@ public class UploadToOssUtil {
|
|
|
//创建oss客户端
|
|
|
OSSClient ossClient = new OSSClient(point, key, secrey);
|
|
|
// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
|
|
|
- OSSObject ossObject = ossClient.getObject(bucket, objectName);
|
|
|
- String key = ossObject.getKey();
|
|
|
- if(StrUtil.isNotEmpty(key))
|
|
|
- return true;
|
|
|
+ try{
|
|
|
+ OSSObject ossObject = ossClient.getObject(bucket, objectName);
|
|
|
+ String key = ossObject.getKey();
|
|
|
+ if(StrUtil.isNotEmpty(key))
|
|
|
+ return true;
|
|
|
+ }catch (Exception e){
|
|
|
+ log.error("s4判断是否存在key异常,key=" + objectName, e);
|
|
|
+ }finally {
|
|
|
+ if(ossClient != null){
|
|
|
+ ossClient.shutdown();
|
|
|
+ }
|
|
|
+ }
|
|
|
return false;
|
|
|
}
|
|
|
|
|
@@ -936,11 +963,19 @@ public class UploadToOssUtil {
|
|
|
.withCredentials(new AWSStaticCredentialsProvider(awsCreds))
|
|
|
.withRegion(Regions.EU_WEST_2)
|
|
|
.build();
|
|
|
- GetObjectRequest request = new GetObjectRequest(bucket,objectName);
|
|
|
- S3Object s3Object = s3.getObject(request);
|
|
|
- String key = s3Object.getKey();
|
|
|
- if(StrUtil.isNotEmpty(key))
|
|
|
- return true;
|
|
|
+ try {
|
|
|
+ GetObjectRequest request = new GetObjectRequest(bucket,objectName);
|
|
|
+ S3Object s3Object = s3.getObject(request);
|
|
|
+ String key = s3Object.getKey();
|
|
|
+ if(StrUtil.isNotEmpty(key))
|
|
|
+ return true;
|
|
|
+ }catch (Exception e){
|
|
|
+ log.error("s4判断是否存在key异常,key=" + objectName, e);
|
|
|
+ }finally {
|
|
|
+ if(s3 != null){
|
|
|
+ s3.shutdown();
|
|
|
+ }
|
|
|
+ }
|
|
|
return false;
|
|
|
}
|
|
|
|
|
@@ -1002,7 +1037,9 @@ public class UploadToOssUtil {
|
|
|
}catch (Exception e){
|
|
|
log.error("阿里云oss文件下载失败,key=" + objectName, e);
|
|
|
}finally {
|
|
|
- ossClient.shutdown();
|
|
|
+ if(ossClient != null){
|
|
|
+ ossClient.shutdown();
|
|
|
+ }
|
|
|
}
|
|
|
return false;
|
|
|
}
|
|
@@ -1026,7 +1063,9 @@ public class UploadToOssUtil {
|
|
|
} catch (Exception e) {
|
|
|
log.error("amazonS3下载文件失败,key=" + objectName, e);
|
|
|
}finally {
|
|
|
- s3.shutdown();
|
|
|
+ if(s3 != null){
|
|
|
+ s3.shutdown();
|
|
|
+ }
|
|
|
}
|
|
|
return false;
|
|
|
}
|