fix: s3 client (#317)

Author: xqvvu

lib/s3/controller.ts

@@ -151,22 +151,8 @@ export class S3Service {
     const externalBaseURL = this.config.externalBaseURL;
 
     // Private
-    if (!this.config.isPublicRead) {
-      const url = await this.client.presignedGetObject(this.config.bucket, objectName, expiry);
-      // 如果有 externalBaseUrl，需要把域名进行替换
-      if (this.config.externalBaseURL) {
-        const urlObj = new URL(url);
-        const externalUrlObj = new URL(this.config.externalBaseURL);
-
-        // 替换协议和域名，保留路径和查询参数
-        urlObj.protocol = externalUrlObj.protocol;
-        urlObj.hostname = externalUrlObj.hostname;
-        urlObj.port = externalUrlObj.port;
-
-        return urlObj.toString();
-      }
-
-      return url;
+    if (!this.config.isPublicRead && this.externalClient) {
+      return await this.externalClient.presignedGetObject(this.config.bucket, objectName, expiry);
     }
 
     // Public
@@ -331,13 +317,11 @@ export class S3Service {
     const name = this.generateFileId();
     const objectName = `${filepath}/${name}`;
 
-    if (fileExpireMins) {
-      await MongoS3TTL.create({
-        bucketName: this.config.bucket,
-        minioKey: objectName,
-        expiredTime: addMinutes(new Date(), fileExpireMins)
-      });
-    }
+    await MongoS3TTL.create({
+      bucketName: this.config.bucket,
+      minioKey: objectName,
+      expiredTime: addMinutes(new Date(), fileExpireMins ?? 60)
+    });
 
     const client = this.externalClient ?? this.client;
 
@@ -370,11 +354,6 @@ export class S3Service {
         }
       })();
 
-      await MongoS3TTL.create({
-        bucketName: this.config.bucket,
-        expiredTime: new Date(Date.now() + 10 * 60 * 1000),
-        minioKey: objectName
-      });
       return {
         postURL,
         formData: res.formData,

runtime/.env.template

@@ -21,8 +21,8 @@ S3_ACCESS_KEY=minioadmin
 S3_SECRET_KEY=minioadmin
 S3_PUBLIC_BUCKET=fastgpt-public # 公开读私有写桶。用于系统工具，创建的临时文件，存储的桶。
 S3_PRIVATE_BUCKET=fastgpt-private # 私有读写桶。用于系统插件热安装文件的桶。
-S3_PATH_STYLE=true    #pathStyle 模式 默认true
-# S3_REGION=
+S3_PATH_STYLE=true    # pathStyle 模式，默认 true
+S3_REGION=
 
 # Signoz
 SIGNOZ_BASE_URL=