tcjlj/PicList
1
0
Fork 0
mirror of https://github.com/Kuingsmile/PicList.git synced 2025-01-23 06:38:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Fix(custom): fix aws s3 urlprefix bug

Browse Source
This commit is contained in:
Kuingsmile 2024-04-22 16:27:31 +08:00
parent 939c907d23
commit 3681681401
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -68,7 +68,7 @@
"multer": "^1.4.5-lts.1", "multer": "^1.4.5-lts.1",
"node-ssh-no-cpu-features": "^1.0.1", "node-ssh-no-cpu-features": "^1.0.1",
"nodejs-file-downloader": "^4.12.1", "nodejs-file-downloader": "^4.12.1",
"piclist": "^1.8.5", "piclist": "^1.8.6",
"pinia": "^2.1.7", "pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.0", "pinia-plugin-persistedstate": "^3.2.0",
"proxy-agent": "^5.0.0", "proxy-agent": "^5.0.0",

13
src/main/utils/deleteFunc.ts
View File

@ -134,12 +134,23 @@ export async function removeFileFromS3InMain (configMap: IStringKeyMap, dogeMode
sessionToken: configMap.config.sessionToken sessionToken: configMap.config.sessionToken
} }
} }
let result: any
try {
const client = new S3Client(s3Options) const client = new S3Client(s3Options)
const command = new DeleteObjectCommand({ const command = new DeleteObjectCommand({
Bucket: bucketName, Bucket: bucketName,
Key: fileKey Key: fileKey
}) })
const result = await client.send(command) result = await client.send(command)
} catch (err: any) {
s3Options.region = 'us-east-1'
const client = new S3Client(s3Options)
const command = new DeleteObjectCommand({
Bucket: bucketName,
Key: fileKey
})
result = await client.send(command)
}
return result.$metadata.httpStatusCode === 204 return result.$metadata.httpStatusCode === 204
} catch (err: any) { } catch (err: any) {
console.log(err) console.log(err)

5
src/renderer/manage/pages/bucketPage.vue
View File

@ -2832,9 +2832,8 @@ async function getBucketFileListBackStage () {
isLoadingData.value = true isLoadingData.value = true
const fileTransferStore = useFileTransferStore() const fileTransferStore = useFileTransferStore()
fileTransferStore.resetFileTransferList() fileTransferStore.resetFileTransferList()
if (currentPicBedName.value === 'webdavplist' || const picBedNamesArr = ['webdavplist', 'local', 'sftp']
currentPicBedName.value === 'local' || if (picBedNamesArr.includes(currentPicBedName.value)) {
currentPicBedName.value === 'sftp') {
param.baseDir = configMap.baseDir param.baseDir = configMap.baseDir
param.webPath = configMap.webPath param.webPath = configMap.webPath
} }

8
yarn.lock
View File

@ -12397,10 +12397,10 @@ performance-now@^2.1.0:
resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
piclist@^1.8.5: piclist@^1.8.6:
version "1.8.5" version "1.8.6"
resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.8.5.tgz#982f481420c83cb42d6c1ff07bd2ad467ed71539" resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.8.6.tgz#858706b5628953926ce0777d4a287482c2ebee10"
integrity sha512-RrSWViLbgTb3VeZ5Poajo6oyRbpFovF3g48/JiyMG6XChdt7BZ1dD/URmPzfrQNZM+bwunSwJr1yjhK87cSvwA== integrity sha512-ja/bUCifnoI/J2zTI79Kkuao4rdm64ZL6kqUFcZ2aSHQULLsFMkgDPiPPvVN5wF8Sv7mX9z4fVmj6UVM7r5uQQ==
dependencies: dependencies:
"@aws-sdk/client-s3" "3.421.0" "@aws-sdk/client-s3" "3.421.0"
"@aws-sdk/lib-storage" "3.421.0" "@aws-sdk/lib-storage" "3.421.0"