KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】OssBootUtil文件

Browse Source
This commit is contained in:
梁琦涛
2023-03-03 15:15:43 +08:00
parent 30d6e144c3
commit bb07657cba
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oss/OssBootUtil.java
+18 -10
View File
@@ -29,6 +29,10 @@ import java.util.UUID;
@Slf4j
public class OssBootUtil {
private OssBootUtil(){
}
private static String endPoint;
private static String accessKeyId;
private static String accessKeySecret;
@@ -84,6 +88,10 @@ public class OssBootUtil {
*/
private static OSSClient ossClient = null;
private static final String HTTPS_CONSTANT = "https://";
private static final String OSS_UPLOAD_CONSTANT = "------OSS文件上传成功------";
/**
* 上传文件至阿里云 OSS
* 文件上传成功,返回文件完整访问路径
@@ -108,7 +116,7 @@ public class OssBootUtil {
}
// 获取文件名
String orgName = file.getOriginalFilename();
if("" == orgName){
if("".equals(orgName)){
orgName=file.getName();
}
//update-begin-author:liusq date:20210809 for: 过滤上传文件类型
@@ -129,13 +137,13 @@ public class OssBootUtil {
if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith("http")) {
FILE_URL = staticDomain + "/" + fileUrl;
} else {
FILE_URL = "https://" + newBucket + "." + endPoint + "/" + fileUrl;
FILE_URL = HTTPS_CONSTANT + newBucket + "." + endPoint + "/" + fileUrl;
}
PutObjectResult result = ossClient.putObject(newBucket, fileUrl.toString(), file.getInputStream());
// 设置权限(公开读)
// ossClient.setBucketAcl(newBucket, CannedAccessControlList.PublicRead);
if (result != null) {
log.info("------OSS文件上传成功------" + fileUrl);
log.info(OSS_UPLOAD_CONSTANT + fileUrl);
}
} catch (IOException e) {
e.printStackTrace();
@@ -153,7 +161,7 @@ public class OssBootUtil {
* @Return: java.lang.String
*/
public static String getOriginalUrl(String url) {
String originalDomain = "https://" + bucketName + "." + endPoint;
String originalDomain = HTTPS_CONSTANT + bucketName + "." + endPoint;
if(oConvertUtils.isNotEmpty(staticDomain) && url.indexOf(staticDomain)!=-1){
url = url.replace(staticDomain,originalDomain);
}
@@ -194,13 +202,13 @@ public class OssBootUtil {
if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith("http")) {
FILE_URL = staticDomain + "/" + fileUrl;
} else {
FILE_URL = "https://" + bucketName + "." + endPoint + "/" + fileUrl;
FILE_URL = HTTPS_CONSTANT + bucketName + "." + endPoint + "/" + fileUrl;
}
PutObjectResult result = ossClient.putObject(bucketName, fileUrl.toString(), file.openStream());
// 设置权限(公开读)
ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
if (result != null) {
log.info("------OSS文件上传成功------" + fileUrl);
log.info(OSS_UPLOAD_CONSTANT + fileUrl);
}
} catch (IOException e) {
e.printStackTrace();
@@ -230,7 +238,7 @@ public class OssBootUtil {
if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith("http")) {
bucketUrl = staticDomain + "/" ;
} else {
bucketUrl = "https://" + newBucket + "." + endPoint + "/";
bucketUrl = HTTPS_CONSTANT + newBucket + "." + endPoint + "/";
}
url = url.replace(bucketUrl,"");
ossClient.deleteObject(newBucket, url);
@@ -323,16 +331,16 @@ public class OssBootUtil {
if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith("http")) {
FILE_URL = staticDomain + "/" + relativePath;
} else {
FILE_URL = "https://" + bucketName + "." + endPoint + "/" + fileUrl;
FILE_URL = HTTPS_CONSTANT + bucketName + "." + endPoint + "/" + fileUrl;
}
PutObjectResult result = ossClient.putObject(bucketName, fileUrl.toString(),stream);
// 设置权限(公开读)
ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
if (result != null) {
log.info("------OSS文件上传成功------" + fileUrl);
log.info(OSS_UPLOAD_CONSTANT + fileUrl);
}
return FILE_URL;
}
}
}