perf: 1.优化文件夹的并发上传; 2.优化文件同步到数据库的操作

2022-08-21 16:23:55 +08:00 · 2022-08-21 16:23:55 +08:00 · b3d21d50ca
commit b3d21d50ca
parent 076236a33a
15 changed files with 29 additions and 21 deletions
--- a/src/api/setting-api.js
+++ b/src/api/setting-api.js
@ -8,6 +8,13 @@ export default {
      params
    })
  },
+  isSync(params) {
+    return request({
+      url: '/user/setting/isSync',
+      method: 'get',
+      params
+    })
+  },
  getWebp(params) {
    return request({
      url: '/user/setting/get/webp',
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@ -1847,7 +1847,6 @@ export default {
              this.officePreviewVisible = true
              break
          }
-          this.$message.success(`新建文件成功`)
          const that = this
          setTimeout(function () {
            that.newCreateFileDialog = false
@ -2345,7 +2344,6 @@ export default {
    rowRename(newFileName, row) {
      //去掉回车换行
      newFileName = newFileName.replace(/[\r\n]/g, "");
-      console.log('newFileName', newFileName)
      if (newFileName) {
        if (/[\[\]\/\\"<>\?\*]/gi.test(newFileName)) {
          this.$message({
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@ -98,11 +98,11 @@
        username: this.$store.state.user.name,
        options: {
          target: api.simpleUploadURL,
-          chunkSize: 3 * 1024 * 1024,
+          chunkSize: 1 * 1024 * 1024,
          // speedSmoothingFactor: 0.1,
          // progressCallbacksInterval: 500,
-          maxChunkRetries: 1, // 最大重试次数
-          simultaneousUploads: 5, // 并发上传数
+          maxChunkRetries: 5, // 最大重试次数
+          simultaneousUploads: 10, // 并发上传数
          testChunks: true, // 是否开启服务器分片校验
          // 服务器分片校验函数，秒传及断点续传基础
          checkChunkUploadedByResponse: function(chunk, message) {
--- a/src/components/input/UploadImageInput.vue
+++ b/src/components/input/UploadImageInput.vue
@ -192,7 +192,6 @@ export default {
      };
      xhr.onerror = function (){
        that.uploadState = 3
-        console.log(this.status, this.response)
      }
      xhr.send();
    },
--- a/src/components/office/OnlyOfficeEditor.vue
+++ b/src/components/office/OnlyOfficeEditor.vue
@ -184,7 +184,6 @@ export default {
      this.$emit('onReady')
    },
    onDocumentReady() {
-      console.log('onDocumentReady')
      let parentDoc = document.querySelector('.component-only-office')
      let doc = parentDoc.getElementsByTagName('iframe')[0].contentWindow.document
      let logo = doc.querySelector('.extra .logo')
--- a/src/components/preview/ImageViewer.vue
+++ b/src/components/preview/ImageViewer.vue
@ -90,7 +90,6 @@ export default {
        let viewIndex = 0
        this.imageFiles = this.fileList.filter(element => !element.isFolder && element.contentType.startsWith('image'))
        this.imageFiles.forEach((element) => {
-          console.log(element)
          this.images.push({
            thumbnail: this.getImageUrlbyThumbnail(element.id),
            source: this.getImageUrl(element)
--- a/src/components/preview/OfficePreview.vue
+++ b/src/components/preview/OfficePreview.vue
@ -183,7 +183,6 @@ export default {
      }
    },
    onbeforeunload(event) {
-      console.log('event', event)
      event.returnValue=("文件未保存, 确定退出吗?");
    },
    /**
--- a/src/components/preview/VideoPreview.vue
+++ b/src/components/preview/VideoPreview.vue
@ -167,11 +167,9 @@ export default {
        this.closeBarShow = true
      },
      ontouchstart() {
-        console.log('ontouchstart', this.closeBarShow)
        this.closeBarShow = true
      },
      ontouchsend() {
-        console.log('ontouchsend', this.closeBarShow)
        this.closeBarShow = false
        this.clearTimeout()
      }
--- a/src/permission.js
+++ b/src/permission.js
@ -103,7 +103,6 @@ function findPath(menuList, to, parentPath){
      }
    }
    if(parentPath){
-      console.log("parentPath", parentPath)
      menu.path = parentPath + '/' + menu.path
    }
    if(menu.path === to) return true
--- a/src/utils/common.js
+++ b/src/utils/common.js
@ -420,7 +420,6 @@
                if (height !== tmpHeight || width !== tmpWidth) {
                    height = tmpHeight;
                    width = tmpWidth;
-                    console.log(width, height);
                    if (typeof callback === 'function') callback();
                }
            }, 250);
--- a/src/views/public/share/shareList.vue
+++ b/src/views/public/share/shareList.vue
@ -842,7 +842,6 @@
        this.$refs.contextShow.hideMenu()
      },
      downloadFile(copy) {
-        console.log('downloadFile', copy)
        let totalSize = 0
        if(this.indexList.length > 0){
          this.selectRowData.forEach(item => {
--- a/src/views/setting/articles/articleManager.vue
+++ b/src/views/setting/articles/articleManager.vue
@ -274,7 +274,6 @@ export default {
            fileIdList.push(article.id)
          })
          // 修改排序
-          console.log(fileIdList)
          markdownApi.sortMarkdown(fileIdList).then(()=>{

          }).catch(() => {
--- a/src/views/setting/cloudManager.vue
+++ b/src/views/setting/cloudManager.vue
@ -38,6 +38,7 @@
 <script>

 import settingApi from "@/api/setting-api";
+import Bus from "@/assets/js/bus";

 export default {
  data() {
@ -50,6 +51,13 @@ export default {
  },
  mounted() {
    this.getInfo()
+    this.getIsSync()
+    Bus.$on('msg/synced', () => {
+      this.syncLoading = false
+    })
+  },
+  destroyed() {
+    Bus.$off()
  },
  methods: {
    getInfo(){
@ -57,6 +65,11 @@ export default {
        this.webpEnabled = !res.data
      })
    },
+    getIsSync() {
+      settingApi.isSync().then((res) => {
+        this.syncLoading = res.data
+      })
+    },
    sync() {
      this.$confirm('是否开始同步? ', '提示', {
        confirmButtonText: '确定',
@ -65,12 +78,9 @@ export default {
      }).then(() => {
        this.syncLoading = true
        settingApi.sync({username: this.$store.state.user.name}).then(() => {
-          this.syncLoading = false
        }).catch(() => {
-          this.syncLoading = false
        })
      }).catch(() => {
-        this.syncLoading = false
      })
    },
    // 重置角色菜单
--- a/src/views/setting/sys/cusomerInfo.vue
+++ b/src/views/setting/sys/cusomerInfo.vue
@ -203,7 +203,6 @@
      },
      // 确认密码
      onSavePassword() {
-        console.log('this.validOldPass', this.validOldPass)
        if(this.validOldPass){
          this.$refs.passwordForm.validate((valid) => {
            this.valid = valid
@ -274,7 +273,6 @@
        let data = new FormData();
        data.append('id', this.$store.state.user.userId)
        // data.append('avatar', dataURL)
-        console.log(this.blobToFile(blob))
        data.append('blobAvatar',blob)
        this.userUpdate(data,dataURL)
      },
--- a/src/websocket/sockJS.js
+++ b/src/websocket/sockJS.js
@ -33,7 +33,12 @@ function connect(username,token){
    ws.isConnected = true;
    // 订阅消息
    ws.stompClient.subscribe('/user/queue/update', (msg) => {
-      Bus.$emit('msg/file/change', msg)
+      const url = msg.headers.url
+      if (url === 'synced') {
+        Bus.$emit('msg/synced', msg)
+      } else {
+        Bus.$emit('msg/file/change', msg)
+      }
    }, ws.headers);
  }, (err) => {
    ws.isConnected = false;