Schisandra-Cloud-Storage/schisandra-cloud-storage
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev'

Browse Source
This commit is contained in:
landaiqing
2024-07-15 23:19:55 +08:00
parent 779e1b33fc 12463389cf
commit 86b8689ca5
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssClient.java
View File

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.io.unit.DataSizeUtil; import cn.hutool.core.io.unit.DataSizeUtil;
import cn.hutool.core.lang.hash.Hash;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@@ -14,8 +13,6 @@ import com.aliyun.oss.OSS;
import com.aliyun.oss.common.utils.HttpHeaders; import com.aliyun.oss.common.utils.HttpHeaders;
import com.aliyun.oss.model.*; import com.aliyun.oss.model.*;
import com.qiniu.storage.BucketManager;
import com.qiniu.storage.model.FileInfo;
import com.schisandra.oss.application.oss.constant.OssConstant; import com.schisandra.oss.application.oss.constant.OssConstant;
import com.schisandra.oss.application.oss.core.StandardOssClient; import com.schisandra.oss.application.oss.core.StandardOssClient;
import com.schisandra.oss.application.oss.core.ali.model.AliOssConfig; import com.schisandra.oss.application.oss.core.ali.model.AliOssConfig;
@@ -35,6 +32,7 @@ import org.springframework.stereotype.Component;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URL;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@@ -57,6 +55,12 @@ public class AliOssClient implements StandardOssClient {
private OSS oss; private OSS oss;
private AliOssConfig aliOssConfig; private AliOssConfig aliOssConfig;
public String getAliPreviewUrl(String fileName) {
URL presignedUrl = oss.generatePresignedUrl(getBucketName(), fileName, new Date());
return String.valueOf(presignedUrl);
}
public String getAliBucketSize(String bucket) { public String getAliBucketSize(String bucket) {
ObjectListing objectListing = oss.listObjects(bucket, ""); ObjectListing objectListing = oss.listObjects(bucket, "");
long x = 0L; long x = 0L;
@@ -172,8 +176,7 @@ public class AliOssClient implements StandardOssClient {
try { try {
if (oss.doesBucketExist(bucketName)) { if (oss.doesBucketExist(bucketName)) {
VoidResult voidResult = oss.deleteBucket(bucketName); VoidResult voidResult = oss.deleteBucket(bucketName);
} } else {
else{
return "bucket does not exist"; return "bucket does not exist";
} }
} catch (Exception e) { } catch (Exception e) {