|
@@ -69,9 +69,9 @@ public class HuaweiObsUtil {
|
|
int statusCode = response.getStatusCode();
|
|
int statusCode = response.getStatusCode();
|
|
if (200 == statusCode) {
|
|
if (200 == statusCode) {
|
|
// 拼接文件在OBS中的URL并返回
|
|
// 拼接文件在OBS中的URL并返回
|
|
- String uploadUrl = getUploadUrl(originalFilename, prefix);
|
|
|
|
- //String objectUrl = "https://"+path + "/" + objectName;
|
|
|
|
- return uploadUrl;
|
|
|
|
|
|
+ // String uploadUrl = getUploadUrl(originalFilename, prefix);
|
|
|
|
+ String objectUrl = path + objectName;
|
|
|
|
+ return objectUrl;
|
|
}
|
|
}
|
|
|
|
|
|
} finally {
|
|
} finally {
|
|
@@ -105,9 +105,8 @@ public class HuaweiObsUtil {
|
|
int statusCode = response.getStatusCode();
|
|
int statusCode = response.getStatusCode();
|
|
if (200 == statusCode) {
|
|
if (200 == statusCode) {
|
|
// 拼接文件在OBS中的URL并返回
|
|
// 拼接文件在OBS中的URL并返回
|
|
- String uploadUrl = getUploadUrl(originalFilename, prefix);
|
|
|
|
- //String objectUrl = "https://"+path + "/" + objectName;
|
|
|
|
- return uploadUrl;
|
|
|
|
|
|
+ String objectUrl = path + objectName;
|
|
|
|
+ return objectUrl;
|
|
}
|
|
}
|
|
|
|
|
|
} finally {
|
|
} finally {
|
|
@@ -118,72 +117,6 @@ public class HuaweiObsUtil {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 下载文件
|
|
|
|
- *
|
|
|
|
- * @param fileName 文件名称
|
|
|
|
- * @param fileType 文件路径
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- public String getDownloadUrl(String fileName, FileType fileType) {
|
|
|
|
- ObsClient obsClient = null;
|
|
|
|
- obsClient = new ObsClient(ak, sk, endpoint);
|
|
|
|
- // URL有效期,378432000秒. 一年
|
|
|
|
- long expireSeconds = 378432000L;
|
|
|
|
- String objectName = fileType.getType().concat("/").concat(fileName);
|
|
|
|
- TemporarySignatureRequest request = new TemporarySignatureRequest(HttpMethodEnum.GET, expireSeconds);
|
|
|
|
- request.setBucketName(bucketName);
|
|
|
|
- request.setObjectKey(objectName);
|
|
|
|
- TemporarySignatureResponse response = obsClient.createTemporarySignature(request);
|
|
|
|
- return response.getSignedUrl();
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 下载文件
|
|
|
|
- *
|
|
|
|
- * @param fileName 文件名称
|
|
|
|
- * @param prefix 文件路径
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- public String getDownloadUrl(String fileName, String prefix) {
|
|
|
|
- ObsClient obsClient = null;
|
|
|
|
- obsClient = new ObsClient(ak, sk, endpoint);
|
|
|
|
- // URL有效期,378432000秒 * 2. 二年
|
|
|
|
- long expireSeconds = 378432000L * 2;
|
|
|
|
- String objectName = prefix.concat("/").concat(fileName);
|
|
|
|
- TemporarySignatureRequest request = new TemporarySignatureRequest(HttpMethodEnum.GET, expireSeconds);
|
|
|
|
- request.setBucketName(bucketName);
|
|
|
|
- request.setObjectKey(objectName);
|
|
|
|
- TemporarySignatureResponse response = obsClient.createTemporarySignature(request);
|
|
|
|
- return response.getSignedUrl();
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 获取上传地址
|
|
|
|
- *
|
|
|
|
- * @param fileName 文件名称
|
|
|
|
- * @param fileType 文件路径
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- public String getUploadUrl(String fileName, FileType fileType) {
|
|
|
|
- try {
|
|
|
|
- // 创建ObsClient实例
|
|
|
|
- ObsClient obsClient = new ObsClient(ak, sk, endpoint);
|
|
|
|
- // URL有效期,378432000秒. 一年
|
|
|
|
- long expireSeconds = 378432000L;
|
|
|
|
- String objectName = fileType.getType().concat("/").concat(fileName);
|
|
|
|
- TemporarySignatureRequest request = new TemporarySignatureRequest(HttpMethodEnum.GET, expireSeconds);
|
|
|
|
- request.setBucketName(bucketName);
|
|
|
|
- request.setObjectKey(objectName);
|
|
|
|
- TemporarySignatureResponse response = obsClient.createTemporarySignature(request);
|
|
|
|
- return response.getSignedUrl();
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- log.error("获取上传地址异常:{}", e.getMessage(), e);
|
|
|
|
- }
|
|
|
|
- return null;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 获取上传地址
|
|
* 获取上传地址
|
|
*
|
|
*
|
|
@@ -192,21 +125,7 @@ public class HuaweiObsUtil {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public String getUploadUrl(String fileName, String prefix) {
|
|
public String getUploadUrl(String fileName, String prefix) {
|
|
- try {
|
|
|
|
- // 创建ObsClient实例
|
|
|
|
- ObsClient obsClient = new ObsClient(ak, sk, endpoint);
|
|
|
|
- // URL有效期,378432000秒. 一年
|
|
|
|
- long expireSeconds = 378432000L;
|
|
|
|
- String objectName = prefix.concat("/").concat(fileName);
|
|
|
|
- TemporarySignatureRequest request = new TemporarySignatureRequest(HttpMethodEnum.GET, expireSeconds);
|
|
|
|
- request.setBucketName(bucketName);
|
|
|
|
- request.setObjectKey(objectName);
|
|
|
|
- TemporarySignatureResponse response = obsClient.createTemporarySignature(request);
|
|
|
|
- return response.getSignedUrl();
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- log.error("获取上传地址异常:{}", e.getMessage(), e);
|
|
|
|
- }
|
|
|
|
- return null;
|
|
|
|
|
|
+ return path + prefix +"/"+ fileName;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|