From 2d2b62ed9fdfedc78dceecc96f9de4bcd2f0a1ed Mon Sep 17 00:00:00 2001
From: wuzongyong <13203449218@163.com>
Date: Thu, 8 Jan 2026 09:49:34 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"feat(file):=20=E4=B8=BAS3=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=B7=BB=E5=8A=A0=E9=A2=84?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8DURL=E7=BC=93=E5=AD=98=E5=8A=9F=E8=83=BD"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2b6f4df3262ee53e7130adc2dbb8876112a1800c.
---
 .../file/core/client/s3/S3FileClient.java     | 56 +------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/framework/file/core/client/s3/S3FileClient.java b/zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/framework/file/core/client/s3/S3FileClient.java
index 7e9fd653..7b716ba8 100644
--- a/zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/framework/file/core/client/s3/S3FileClient.java
+++ b/zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/framework/file/core/client/s3/S3FileClient.java
@@ -6,7 +6,6 @@ import cn.hutool.http.HttpUtil;
 import com.zt.plat.framework.common.util.spring.SpringUtils;
 import com.zt.plat.module.infra.framework.file.core.client.AbstractFileClient;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -23,7 +22,6 @@ import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignReques
 
 import java.net.URI;
 import java.time.Duration;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 基于 S3 协议的文件客户端，实现 MinIO、阿里云、腾讯云、七牛云、华为云等云服务
@@ -34,15 +32,6 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
 
     private static final Duration DEFAULT_PRESIGNED_EXPIRATION = Duration.ofHours(24);
     private static final String PRESIGN_EXPIRE_SECONDS_PROPERTY = "zt.file.download-expire-seconds";
-    /**
-     * Redis 缓存 key 前缀：文件预签名 URL
-     */
-    private static final String CACHE_KEY_PREFIX = "file:presigned:url:";
-    /**
-     * Redis 缓存时间：50 分钟
-     */
-    private static final long CACHE_EXPIRE_MINUTES = 50L;
-
     /**
      * 生成临时下载地址（预签名下载 URL）
      * @param path 文件路径
@@ -56,17 +45,6 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
             return StringUtils.EMPTY;
         }
 
-        // 1. 尝试从 Redis 缓存中获取
-        String cacheKey = CACHE_KEY_PREFIX + path;
-        RedisTemplate<String, Object> redis = getRedisTemplate();
-        if (redis != null) {
-            Object cachedUrl = redis.opsForValue().get(cacheKey);
-            if (cachedUrl instanceof String) {
-                return (String) cachedUrl;
-            }
-        }
-
-        // 2. 缓存未命中，调用 S3 生成预签名 URL
         // 使用 S3 官方支持的 responseCacheControl 参数，强制浏览器和代理不缓存
         GetObjectRequest.Builder getObjectRequestBuilder = GetObjectRequest.builder()
                 .bucket(config.getBucket())
@@ -76,37 +54,12 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
                 .signatureDuration(realExpiration)
                 .getObjectRequest(getObjectRequestBuilder.build())
                 .build();
-        String presignedUrl = presigner.presignGetObject(getObjectPresignRequest).url().toString();
-
-        // 3. 将生成的 URL 存入 Redis 缓存
-        if (redis != null && presignedUrl != null && !presignedUrl.isEmpty()) {
-            redis.opsForValue().set(cacheKey, presignedUrl, CACHE_EXPIRE_MINUTES, TimeUnit.MINUTES);
-        }
-
-        return presignedUrl;
-    }
-
-    /**
-     * 获取 RedisTemplate 实例（延迟加载，避免初始化时循环依赖）
-     */
-    @SuppressWarnings("unchecked")
-    private RedisTemplate<String, Object> getRedisTemplate() {
-        if (redisTemplate == null) {
-            try {
-                redisTemplate = SpringUtils.getBean("redisTemplate", RedisTemplate.class);
-            } catch (Exception e) {
-                // Redis 不可用时，不影响正常功能，只是不使用缓存
-                return null;
-            }
-        }
-        return redisTemplate;
+        return presigner.presignGetObject(getObjectPresignRequest).url().toString();
     }
 
     private S3Client client;
     private S3Presigner presigner;
 
-    private RedisTemplate<String,Object> redisTemplate;
-
     public S3FileClient(Long id, S3FileClientConfig config) {
         super(id, config);
     }
@@ -162,13 +115,6 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
                 .key(path)
                 .build();
         client.deleteObject(deleteRequest);
-
-        // 删除文件后，清除对应的缓存
-        String cacheKey = CACHE_KEY_PREFIX + path;
-        RedisTemplate<String, Object> redis = getRedisTemplate();
-        if (redis != null) {
-            redis.delete(cacheKey);
-        }
     }
 
     @Override