fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2024-11-23 06:21:13 +00:00
commit 98ce19e918
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
View File

@ -100,7 +100,7 @@ async function multipart(ctx: Context, next: Next) {
return ctx.throw(400, err);
}
ctx.logger.error(err);
return ctx.throw(500);
return ctx.throw(500, err);
}
const values = getFileData(ctx);

2
packages/plugins/@nocobase/plugin-file-manager/src/server/storages/s3.ts
View File

@ -19,6 +19,8 @@ export default class extends StorageType {
const { accessKeyId, secretAccessKey, bucket, acl = 'public-read', ...options } = storage.options;
if (options.endpoint) {
options.forcePathStyle = true;
} else {
options.endpoint = undefined;
}
const s3 = new S3Client({
...options,