diff --git a/bun.lock b/bun.lock index 72c441a7..4571d2c7 100644 --- a/bun.lock +++ b/bun.lock @@ -1063,6 +1063,8 @@ "fast-xml-parser": ["fast-xml-parser@4.5.3", "", { "dependencies": { "strnum": "^1.1.1" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig=="], + "fastgpt-plugins": ["fastgpt-plugins@root:", {}], + "fastq": ["fastq@1.19.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="], "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="], diff --git a/lib/s3/config.ts b/lib/s3/config.ts index 4288f0c1..2860b5ab 100644 --- a/lib/s3/config.ts +++ b/lib/s3/config.ts @@ -29,7 +29,7 @@ export function createDefaultStorageOptions() { case 'minio': { return { vendor: 'minio', - forcePathStyle: true, + forcePathStyle: env.STORAGE_S3_FORCE_PATH_STYLE, externalBaseUrl: env.STORAGE_EXTERNAL_ENDPOINT, endpoint: env.STORAGE_S3_ENDPOINT, region: env.STORAGE_REGION, diff --git a/lib/s3/index.ts b/lib/s3/index.ts index 62fe0118..345a3614 100644 --- a/lib/s3/index.ts +++ b/lib/s3/index.ts @@ -33,7 +33,7 @@ const getConfig = () => { region, vendor, credentials, - forcePathStyle: vendor === 'minio' ? true : options.forcePathStyle, + forcePathStyle: options.forcePathStyle, endpoint: options.endpoint!, maxRetries: options.maxRetries! };