From 782b1d6bcbe96fc60aefee2f933a47239eeb70de Mon Sep 17 00:00:00 2001 From: jmal Date: Thu, 18 Feb 2021 18:05:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=EF=BC=9A=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=B7=BB=E5=8A=A0=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Cropper/dialog.vue | 2 +- src/components/ShowFile/ShowFile.vue | 6 +++--- src/components/input/UploadImageInput.vue | 2 +- src/components/preview/AudioPreview.vue | 2 +- src/components/preview/ImageViewer.vue | 2 +- src/components/preview/VideoPreview.vue | 2 +- src/utils/file-config.js | 17 ++++++++--------- src/views/home/mobile/index.vue | 2 +- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/components/Cropper/dialog.vue b/src/components/Cropper/dialog.vue index 620a474..3170940 100644 --- a/src/components/Cropper/dialog.vue +++ b/src/components/Cropper/dialog.vue @@ -93,7 +93,7 @@ if(selectImg.id){ this.loading = true this.cropper.reset() - let url = fileConfig.previewUrl(this.$store.state.user.name, selectImg) + '?o=crop&w=1024' + let url = fileConfig.previewUrl(this.$store.state.user.name, selectImg, this.$store.getters.token) + '&o=crop&w=1024' this.sourceImg = url this.cropper.replace(url) this.loading = false diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index 9b62687..5025e13 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -2755,7 +2755,7 @@ export default { fileConfig.packageDownload(fileIds, this.$store.state.user.token) return } - fileConfig.download(this.$store.state.user.name, this.rowContextData) + fileConfig.download(this.$store.state.user.name, this.rowContextData, this.$store.getters.token) } else { this.$message({ message: '所选文件为空', @@ -2980,7 +2980,7 @@ export default { if (window.location.port.length > 0) { host = window.location.host.substring(0, window.location.host.length - window.location.port.length - 1) } - fileConfig.preview(this.$store.state.user.name, row) + fileConfig.preview(this.$store.state.user.name, row, this.$store.getters.token) return } if (suffix.compressedFile.includes(row.suffix)) { @@ -3007,7 +3007,7 @@ export default { this.notPreviewDialogVisible = false }, downLaod(file) { - fileConfig.download(this.$store.state.user.name, file) + fileConfig.download(this.$store.state.user.name, file, this.$store.getters.token) }, } } diff --git a/src/components/input/UploadImageInput.vue b/src/components/input/UploadImageInput.vue index dbe078d..b4eb832 100644 --- a/src/components/input/UploadImageInput.vue +++ b/src/components/input/UploadImageInput.vue @@ -124,7 +124,7 @@ export default { input(value) { }, selectedFile(row) { - this.currentValue = window.location.origin + fileConfig.previewUrl(this.$store.state.user.name, row) + this.currentValue = window.location.origin + fileConfig.previewUrl(this.$store.state.user.name, row, this.$store.getters.token) this.change(this.currentValue) }, handleBeforeUpload(){ diff --git a/src/components/preview/AudioPreview.vue b/src/components/preview/AudioPreview.vue index 6a41333..d549834 100644 --- a/src/components/preview/AudioPreview.vue +++ b/src/components/preview/AudioPreview.vue @@ -49,7 +49,7 @@ export default { pic.addEventListener('click', this.onPicClick); Bus.$on('onAddAudio',(newFile, audioCoverUrl) => { this.show = true - let url = fileConfig.previewUrl(this.$store.state.user.name, newFile) + let url = fileConfig.previewUrl(this.$store.state.user.name, newFile, this.$store.getters.token) console.log(url) if(!this.$store.state.user.token){ url = fileConfig.publicPreviewUrl(newFile.id); diff --git a/src/components/preview/ImageViewer.vue b/src/components/preview/ImageViewer.vue index 04a8f5c..978452e 100644 --- a/src/components/preview/ImageViewer.vue +++ b/src/components/preview/ImageViewer.vue @@ -89,7 +89,7 @@ this.fileList.forEach((element,index) => { if(index < findIndex + 5 && index > findIndex - 5 ) { if(!element.isFolder && element.contentType.startsWith('image')){ - let url = fileConfig.previewUrl(this.$store.state.user.name, element) + let url = fileConfig.previewUrl(this.$store.state.user.name, element, this.$store.getters.token) if(this.shareId){ url = fileConfig.publicPreviewUrl(element.id); } diff --git a/src/components/preview/VideoPreview.vue b/src/components/preview/VideoPreview.vue index b42af2d..877f818 100644 --- a/src/components/preview/VideoPreview.vue +++ b/src/components/preview/VideoPreview.vue @@ -99,7 +99,7 @@ export default { watch: { status: function(visible){ if(visible){ - let url = fileConfig.previewUrl(this.$store.state.user.name, this.file) + let url = fileConfig.previewUrl(this.$store.state.user.name, this.file, this.$store.getters.token) if(this.shareId){ url = fileConfig.publicPreviewUrl(this.file.id); } diff --git a/src/utils/file-config.js b/src/utils/file-config.js index 4dde2f6..800f9ef 100644 --- a/src/utils/file-config.js +++ b/src/utils/file-config.js @@ -6,27 +6,26 @@ export default { webDAVUrl: function(username) { return window.location.origin + `${this.baseUrl}/webDAV/${username}` }, - previewUrl: function(username, file) { - return `${this.baseUrl}/file/${username}${file.path}${file.name}` + previewUrl: function(username, file, token) { + return `${this.baseUrl}/file/${username}${file.path}${file.name}?jmal-token=${token}` }, mardownPreviewUrl: function (path){ return window.location.origin + `${this.baseUrl}${path}` }, - publicPreviewUrl: function(fileIds) { - return `${this.baseUrl}/public/preview/${fileIds}` + publicPreviewUrl: function(fileId) { + return `${this.baseUrl}/public/preview/${fileId}` }, - preview: function(username, file) { - const url = this.previewUrl(username, file) - console.log(url) + preview: function(username, file, token) { + const url = this.previewUrl(username, file, token) window.open(url, '_blank') }, publicPreview: function(fileIds) { const url = this.publicPreviewUrl(fileIds) window.open(url, '_blank') }, - download: function(username, file) { + download: function(username, file, token) { fileApi.isAllowDownload().then(() => { - let url = `${this.baseUrl}/file/${username}${file.path}${file.name}?o=download` + let url = `${this.baseUrl}/file/${username}${file.path}${file.name}?jmal-token=${token}&o=download` window.open(url, '_self') }) }, diff --git a/src/views/home/mobile/index.vue b/src/views/home/mobile/index.vue index 9c3acfc..39cf525 100644 --- a/src/views/home/mobile/index.vue +++ b/src/views/home/mobile/index.vue @@ -986,7 +986,7 @@ this.$router.push(`/public/articles/article?mark=${row.id}`) }else{ // 打开文件 - fileConfig.preview(this.$store.state.user.token, row) + fileConfig.preview(this.$store.state.user.token, row, this.$store.getters.token) } } }