✨ S3 协议新增是否为私有空间支持

src/main/java/im/zhaojun/common/service/AbstractS3FileService.java

@@ -1,5 +1,6 @@
 package im.zhaojun.common.service;
 
+import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.URLUtil;
 import com.amazonaws.services.s3.AmazonS3;
@@ -20,7 +21,6 @@ import java.util.Objects;
 
 /**
  * @author zhaojun
- * @date 2019/12/26 22:26
  */
 public abstract class AbstractS3FileService extends AbstractFileService {
 
@@ -37,6 +37,8 @@ public abstract class AbstractS3FileService extends AbstractFileService {
 
     protected AmazonS3 s3Client;
 
+    protected boolean isPrivate;
+
     @Override
     public List<FileItemDTO> fileList(String path) {
         this.path = path;
@@ -95,6 +97,11 @@ public abstract class AbstractS3FileService extends AbstractFileService {
     public String s3ObjectUrl(String path) {
         String fullPath = StringUtils.removeFirstSeparator(StringUtils.removeDuplicateSeparator(basePath + "/" + path));
 
+        // 如果不是私有空间, 且指定了加速域名, 则直接返回下载地址.
+        if (BooleanUtil.isFalse(isPrivate) && StringUtils.isNotNullOrEmpty(domain)) {
+            return StringUtils.concatPath(domain, fullPath);
+        }
+
         Date expirationDate = new Date(System.currentTimeMillis() + timeout * 1000);
         URL url = s3Client.generatePresignedUrl(bucketName, fullPath, expirationDate);