diff --git a/src/main/java/com/njcn/huawei/obs/util/OBSUtil.java b/src/main/java/com/njcn/huawei/obs/util/OBSUtil.java index 09928c3..1758e6a 100644 --- a/src/main/java/com/njcn/huawei/obs/util/OBSUtil.java +++ b/src/main/java/com/njcn/huawei/obs/util/OBSUtil.java @@ -1,5 +1,6 @@ package com.njcn.huawei.obs.util; +import cn.hutool.core.util.StrUtil; import com.njcn.huawei.obs.config.HuaweiObsProperties; import com.obs.services.ObsClient; import com.obs.services.exception.ObsException; @@ -105,28 +106,30 @@ public class OBSUtil { /*** * 获取文件上传后的url + * 对象访问路径为:https://桶名.域名/对象名。例如:https://bucketname.obs.cn-north-4.myhuaweicloud.com/objectname * @author hongawen * @date 2023/3/2 11:46 */ public String getFileUrl(String fileName) { - ObsClient obsClient = null; - try { - obsClient = huaweiObsProperties.getInstance(); - // URL有效期,3600秒 - Map headers = new HashMap<>(); - headers.put("Content-Type", "application/octet-stream"); - TemporarySignatureRequest request = new TemporarySignatureRequest(HttpMethodEnum.PUT, huaweiObsProperties.getObs().getExpire()); - request.setBucketName(huaweiObsProperties.getObs().getBucket()); - request.setObjectKey(fileName); - request.setHeaders(headers); - TemporarySignatureResponse response = obsClient.createTemporarySignature(request); - return response.getSignedUrl(); - } catch (Exception e) { - log.error("获取上传地址异常:{}", e.getMessage(), e); - } finally { - huaweiObsProperties.destroy(obsClient); - } - return null; + return "https://" + huaweiObsProperties.getObs().getBucket() + StrUtil.DOT + huaweiObsProperties.getObs().getEndpoint() + StrUtil.SLASH + fileName; +// ObsClient obsClient = null; +// try { +// obsClient = huaweiObsProperties.getInstance(); +// // URL有效期,3600秒 +// Map headers = new HashMap<>(); +// headers.put("Content-Type", "application/octet-stream"); +// TemporarySignatureRequest request = new TemporarySignatureRequest(HttpMethodEnum.PUT, huaweiObsProperties.getObs().getExpire()); +// request.setBucketName(huaweiObsProperties.getObs().getBucket()); +// request.setObjectKey(fileName); +// request.setHeaders(headers); +// TemporarySignatureResponse response = obsClient.createTemporarySignature(request); +// return response.getSignedUrl(); +// } catch (Exception e) { +// log.error("获取上传地址异常:{}", e.getMessage(), e); +// } finally { +// huaweiObsProperties.destroy(obsClient); +// } +// return null; } /***