diff --git a/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/core/OssClient.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/core/OssClient.java index 8ea14c4..b7da2c7 100644 --- a/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/core/OssClient.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/core/OssClient.java @@ -12,6 +12,7 @@ import com.pusong.common.oss.properties.OssProperties; import com.pusong.common.oss.constant.OssConstant; import com.pusong.common.oss.entity.UploadResult; import com.pusong.common.oss.exception.OssException; +import lombok.extern.slf4j.Slf4j; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.ResponseInputStream; @@ -42,6 +43,7 @@ import java.time.Duration; * * @author AprilWind */ +@Slf4j public class OssClient { /** @@ -154,6 +156,7 @@ public class OssClient { throw new OssException("创建Bucket失败, 请核对配置信息:[" + e.getMessage() + "]"); } } else { + log.error("createBucket error", ex); throw new OssException("判断Bucket是否存在失败,请核对配置信息:[" + ex.getMessage() + "]"); } } @@ -329,6 +332,9 @@ public class OssClient { .url(); return url.toString(); } + public String getPublicUrl(String objectKey) { + return getUrl() + "/" + objectKey; + } /** * 上传 byte[] 数据到 Amazon S3,使用指定的后缀构造对象键。 diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssServiceImpl.java index f0171db..7fb05f7 100644 --- a/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssServiceImpl.java @@ -279,6 +279,8 @@ public class SysOssServiceImpl implements ISysOssService, OssService { // 仅修改桶类型为 private 的URL,临时URL时长为120s if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) { oss.setUrl(storage.getPrivateUrl(oss.getFileName(), 120)); + }else{ + oss.setUrl(storage.getPublicUrl(oss.getFileName())); } return oss; }