Merge pull request #461 from jamebal/dev

refactor: remove user token and name from image and audio URLs for cleaner API calls

src/components/Cropper/dialog.vue

@@ -94,7 +94,7 @@
         if(selectImg.id){
           this.loading = true
           this.cropper.reset()
-          let url = fileConfig.previewUrl(this.$store.state.user.name, selectImg, this.$store.getters.token) + '&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

src/components/ShareDialog/index.vue

@@ -160,8 +160,8 @@ export default {
   },
   data() {
     return {
-      imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
+      imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?id=`,
-      audioCoverUrl: `${process.env.VUE_APP_BASE_API}/view/cover?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
+      audioCoverUrl: `${process.env.VUE_APP_BASE_API}/view/cover?id=`,
       shareDialogVisible: false,
       generateShareLinkLoading: false,
       cancelSharing: false,

src/components/ShowFile/mixins/common.js

@@ -3,10 +3,10 @@ import { formatSize, formatTime } from '@/utils/number'
 export default {
   computed: {
     imageUrl() {
-      return `${process.env.VUE_APP_BASE_API}/view/thumbnail?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`
+      return `${process.env.VUE_APP_BASE_API}/view/thumbnail?id=`
     },
     audioCoverUrl() {
-      return `${process.env.VUE_APP_BASE_API}/view/cover?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`
+      return `${process.env.VUE_APP_BASE_API}/view/cover?id=`
     }
   },
 

src/components/preview/ImageViewer.vue

@@ -128,7 +128,7 @@ export default {
     },
     getImageUrlByThumbnail(file) {
       if (this.$store.getters.token){
-        return `${this.imageThumbnailUrl}/${file.name}?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=${file.id}`
+        return `${this.imageThumbnailUrl}/${file.name}?id=${file.id}`
       } else {
         if (this.$store.getters.shareToken) {
           return `${this.shareImageThumbnailUrl}/${file.name}?share-token=${this.$store.getters.shareToken}&id=${file.id}`

src/layout/components/Navbar.vue

@@ -73,7 +73,7 @@ export default {
     return {
       isShow: true,
       activeIndex: '1',
-      imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
+      imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?id=`,
       defaultAvatar: require('../../assets/img/default-avatar.png'),
       showTaskProgress: false,
       taskCount: 0,

src/utils/file-config.js

@@ -40,11 +40,11 @@ export default {
     fileUrl = fileUrl.replaceAll(/%5C|%2F/g, '/')
 
     if (file.userId !== store.getters.userId && token && !shareToken) {
-      return `${baseUrl}/pre-file/${file.id}/${encodeURIComponent(file.name)}?jmal-token=${token}&name=${username}`
+      return `${baseUrl}/pre-file/${file.id}/${encodeURIComponent(file.name)}`
     }
 
     if (token) {
-      return `${fileUrl}?jmal-token=${token}&name=${username}`
+      return `${fileUrl}`
     }
     if (shareToken) {
       if (isFilePath(file.id)) {
@@ -58,8 +58,8 @@ export default {
     return `${baseUrl}/share-file/${file.id}/${encodeURIComponent(file.name)}`
   },
   // 预览历史文件
-  previewHistoryUrl: function(historyId, name, token) {
+  previewHistoryUrl: function(historyId) {
-    return `${this.baseUrl}/history/preview/file?id=${historyId}&name=${name}&jmal-token=${token}`
+    return `${this.baseUrl}/history/preview/file?id=${historyId}`
   },
   // markdown里上传图片后的图片预览地址
   markdownPreviewUrl: function (path){
@@ -74,7 +74,7 @@ export default {
   // 下载文件
   download: function(username, file, token) {
     fileApi.isAllowDownload({fileIds: [file.id]}).then(() => {
-      let url = this.previewUrl(username, file, token) + '&o=download'
+      let url = this.previewUrl(username, file, token) + '?o=download'
       window.open(url, '_self')
     })
   },

src/views/home/mobile/index.vue

@@ -306,8 +306,8 @@ export default {
       lastTabbarOffsetTop: 0,// 底部tabbar与上边框 上次的距离
       diffTabbarTop: 0,// 底部tabbar与上边框的变化距离
       isiPhoneX: 0,
-      imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
+      imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?id=`,
-      audioCoverUrl: `${process.env.VUE_APP_BASE_API}/view/cover?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
+      audioCoverUrl: `${process.env.VUE_APP_BASE_API}/view/cover?id=`,
       tabActive: 0,
       path: this.$route.query.path,
       fileList: [],

src/views/setting/articles/blogManager.vue

@@ -209,6 +209,9 @@ export default {
   methods: {
     loadScripts() {
       const preview = this.$refs.previewFooterHtml;
+
+      if (!preview) return;
+
       const scripts = preview.querySelectorAll('script');
 
       scripts.forEach(script => {

src/views/setting/cloudManager.vue

@@ -135,7 +135,7 @@ export default {
   data() {
     return {
       activeName: '1',
-      uploadUrl: `${process.env.VUE_APP_BASE_API}/user/setting/upload_logo?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}`,
+      uploadUrl: `${process.env.VUE_APP_BASE_API}/user/setting/upload_logo`,
       title: this.$t('app.setting'),
       syncLoading: false,
       clickSync: false,

src/views/setting/sys/cusomerInfo.vue

@@ -87,7 +87,7 @@
         }
       };
       return {
-        imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
+        imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?id=`,
         title: "个人信息",
         userUpdateLoading: false,
         dialogAvatar: false,

src/views/share/index.vue

@@ -213,8 +213,8 @@
     },
     data() {
       return {
-        imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
+        imageUrl: `${process.env.VUE_APP_BASE_API}/view/thumbnail?id=`,
-        audioCoverUrl: `${process.env.VUE_APP_BASE_API}/view/cover?jmal-token=${this.$store.state.user.token}&name=${this.$store.state.user.name}&id=`,
+        audioCoverUrl: `${process.env.VUE_APP_BASE_API}/view/cover?id=`,
         path: this.$route.query.path,
         pathList: [
           { 'folder': '', index: 0 },