Merge branch 'main' into lyc-dev

src/main/file.js

@@ -127,9 +127,10 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
         } else {
           const stats = fs.statSync(filePath)
           //如果线上时间大于线下时间，就需要从线上下载，否则则需要上传
-          if (lastModifyTime > stats.mtime.getTime()) {
+          let time = new Date(lastModifyTime)
+          if (time > stats.mtime.getTime()) {
             e.reply('is-async-local-file-reply' + fileNewName, { isAsync: true, type: 'down' })
-          } else if (lastModifyTime < stats.mtime.getTime()) {
+          } else if (time < stats.mtime.getTime()) {
             e.reply('is-async-local-file-reply' + fileNewName, { isAsync: true, type: 'upload' })
           }
         }

src/renderer/src/views/prepare/index.vue

@@ -168,6 +168,7 @@ export default {
           //判断是否需要从线上拿新的文件
           isAsyncLocalFile(item.fileNewName, item.lastModifyTime, item.fileMd5).then(
             ({ isAsync, type }) => {
+              console.log(isAsync, type)
               item.async = !isAsync
               if (isAsync === true) {
                 item.async = 'on'
@@ -182,9 +183,12 @@ export default {
                   })
                 }
                 if (type === 'upload') {
+                  let cookie = localStorage.getItem('Admin-Token')
                   ipcRenderer.send('upload-file-change', {
-                    url: item.fileFullPath,
-                    fileName: item.fileNewName
+                    id: item.id,
+                    fileNewName: item.fileNewName,
+                    cookie,
+                    fileType: item.fileType
                   })
                   ipcRenderer.once(
                     'upload-file-change-success' + item.fileNewName,