shumengya/cloud-mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复附件和背景保存异常

Browse Source
This commit is contained in:
eoao
2026-01-03 00:01:16 +08:00
parent e723af4229
commit 6f83a440dc
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mail-worker/src/service/r2-service.js
View File

@@ -1,7 +1,6 @@
import s3Service from './s3-service'; import s3Service from './s3-service';
import settingService from './setting-service'; import settingService from './setting-service';
import kvObjService from './kv-obj-service'; import kvObjService from './kv-obj-service';
import { settingConst } from '../const/entity-const';
const r2Service = { const r2Service = {
@@ -23,22 +22,20 @@ const r2Service = {
async putObj(c, key, content, metadata) { async putObj(c, key, content, metadata) {
const { kvStorage } = await settingService.query(c); const storageType = await this.storageType(c);
if (kvStorage === settingConst.kvStorage.OPEN) {
if (storageType === 'KV') {
await kvObjService.putObj(c, key, content, metadata); await kvObjService.putObj(c, key, content, metadata);
}
} else if (c.env.r2) { if (storageType === 'R2') {
await c.env.r2.put(key, content, { await c.env.r2.put(key, content, {
httpMetadata: { ...metadata } httpMetadata: { ...metadata }
}); });
}
} else { if (storageType === 'S3') {
await s3Service.putObj(c, key, content, metadata); await s3Service.putObj(c, key, content, metadata);
} }
}, },
@@ -49,20 +46,18 @@ const r2Service = {
async delete(c, key) { async delete(c, key) {
const { kvStorage } = await settingService.query(c); const storageType = await this.storageType(c);
if (kvStorage === settingConst.kvStorage.OPEN) {
if (storageType === 'KV') {
await kvObjService.deleteObj(c, key); await kvObjService.deleteObj(c, key);
}
} else if (c.env.r2) { if (storageType === 'R2') {
await c.env.r2.delete(key); await c.env.r2.delete(key);
}
} else { if (storageType === 'S3'){
await s3Service.deleteObj(c, key); await s3Service.deleteObj(c, key);
} }
} }