From 80db2e2b9efde74eb91c34684100b18a195e4ae1 Mon Sep 17 00:00:00 2001 From: duandazhi Date: Mon, 9 Aug 2021 16:04:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=8A=A0=E7=AD=BE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/file/controller/SysFileController.java | 1 + .../com/ruoyi/file/service/AliyunOssDsfServiceImpl.java | 8 ++++++-- .../java/com/ruoyi/file/service/FastDfsServiceImpl.java | 4 ++++ .../java/com/ruoyi/file/service/MinioDfsServiceImpl.java | 5 +++++ .../java/com/ruoyi/file/service/QiniuDfsServiceImpl.java | 4 ++++ .../com/ruoyi/file/service/TencentCosServiceImpl.java | 6 +++++- 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 31b44d72..2452d1d1 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java index d454d936..071e5bb8 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit; * @date 2019/8/6 19:02 * //@see AliyunMsgUtil */ -//@Primary +@Primary @Service() public class AliyunOssDsfServiceImpl implements IDfsService { private static final Logger log = LoggerFactory.getLogger(AliyunOssDsfServiceImpl.class); @@ -519,13 +519,17 @@ public class AliyunOssDsfServiceImpl implements IDfsService { /** * @param fileUrl https://react-yuebaoxiao-pro.oss-cn-shanghai.aliyuncs.com/dev/upload/default/20210722-03f07351-ae82-410a-a43c-0797a82f07b4.jpeg - * @return + * @return 加签之后的示例：http://react-yuebaoxiao-pro.oss-cn-shanghai.aliyuncs.com/dev/upload/default/20210809-1f545f8e-560c-442d-bd94-95656c77d879.png?Expires=1628528557&OSSAccessKeyId=LTAI4GDQSbwgmbsRxxbDXnKT&Signature=6pPP50doxwCC3cMzHFzgdkf95YQ%3D */ @Override public String presignedUrl(String fileUrl) { if (aliyunOssConfig.getExpiryDuration() == -1) { return fileUrl; } + String signKey = "?Expires="; + if (fileUrl.contains(signKey)) { + return fileUrl; + } String objectKey = this.getStorePath(fileUrl); return this.getStsURL(objectKey); } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsServiceImpl.java index cd093e7f..1b929fcd 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsServiceImpl.java @@ -88,6 +88,10 @@ public class FastDfsServiceImpl implements IDfsService if (StringUtils.isBlank(fastDfsConfig.getTokenSecretKey())) { throw new CustomException("防盗链生成token的密钥为空，请检查：tokenSecretKey"); } + String signKey = "?token="; + if (fileUrl.contains(signKey)) { + return fileUrl; + } String tokenSecretKey = fastDfsConfig.getTokenSecretKey(); StorePath storePath = StorePath.parseFromUrl(fileUrl); diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioDfsServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioDfsServiceImpl.java index 3011d449..f2b62112 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioDfsServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioDfsServiceImpl.java @@ -142,12 +142,17 @@ public class MinioDfsServiceImpl implements IDfsService * http://docs.minio.org.cn/docs/master/minio-sts-quickstart-guide * minio SDKS Java Client API参考文档 http://docs.minio.org.cn/docs/master/java-client-api-reference * Presigned presignedGetObject 预签】 + * 示例：https://xxxx.xxx.gov.cn/file/2021/08/06/cd9dfbaa-8563-423a-bc3d-d0b15e781931.pdf?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=D99KGE6ZTQXSATTJWU24%2F20210809%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20210809T075702Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=198c76edc57998f4dde72124952b43f0066c762356e485dd44d21df9cc7dad78 */ @Override public String presignedUrl(String fileUrl) { if (minioConfig.getExpiryDuration() == -1) { return fileUrl; } + String signKey = "?X-Amz-Algorithm="; + if (fileUrl.contains(signKey)) { + return fileUrl; + } String objectName = this.getStorePath(fileUrl); GetPresignedObjectUrlArgs args = GetPresignedObjectUrlArgs.builder(). bucket(minioConfig.getBucketName()). diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuDfsServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuDfsServiceImpl.java index be466ea4..b5843156 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuDfsServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuDfsServiceImpl.java @@ -127,6 +127,10 @@ public class QiniuDfsServiceImpl implements IDfsService { if (qiniuKodoConfig.getExpiryDuration() == -1) { return fileUrl; } + String signKey = "?e="; + if (fileUrl.contains(signKey)) { + return fileUrl; + } //...其他参数参考类注释 String accessKey = qiniuKodoConfig.getAccessKey(); String secretKey = qiniuKodoConfig.getSecretKey(); diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/TencentCosServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/TencentCosServiceImpl.java index 4ca581e7..850373ae 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/TencentCosServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/TencentCosServiceImpl.java @@ -23,7 +23,7 @@ import java.util.List; * @author yabo * @see TencentCosConfig */ -@Primary +//@Primary @Service() public class TencentCosServiceImpl implements IDfsService { private final COSClient cosClient; @@ -168,6 +168,10 @@ public class TencentCosServiceImpl implements IDfsService { if (config.getExpiryDuration() == -1) { return fileUrl; } + String signKey = "?sign="; + if (fileUrl.contains(signKey)) { + return fileUrl; + } // 存储桶的命名格式为 BucketName-APPID，此处填写的存储桶名称必须为此格式 String bucketName = config.getBucketName(); if (StringUtils.isBlank(config.getBucketName())) {