From 59801de106ef3536928a1337df0385a05d1b6292 Mon Sep 17 00:00:00 2001 From: kim131 <1035828775@qq.com> Date: Mon, 8 Feb 2021 15:00:47 +0800 Subject: [PATCH] update --- src/services/system.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/services/system.js b/src/services/system.js index 6e5176c1..5a676ac8 100644 --- a/src/services/system.js +++ b/src/services/system.js @@ -634,13 +634,13 @@ const system = { if(process !== 100 || !hash) return; socket.close(); - let copyFile = cloneDeep(file); + let copyFile = firstCharToUpperCase(cloneDeep(file)); copyFile.ModifyUserId = sessionStorage.userId; - copyFile.historyPreIpfsCid = historyPreIpfsCid; - copyFile.historyCurrentIpfsCid = commitHistoryHash; + copyFile.HistoryPreIpfsCid = historyPreIpfsCid; + copyFile.HistoryCurrentIpfsCid = commitHistoryHash; if(!isConflict) { // 选择本地文件为服务器最新commit - copyFile.size = +size; - copyFile.ipfsCid = hash; + copyFile.Size = +size; + copyFile.IpfsCid = hash; } // const copyFile = firstCharToUpperCase({ ...file, size: +size, ModifyUserId: sessionStorage.userId, // historyCurrentIpfsCid: commitHistoryHash, @@ -652,8 +652,8 @@ const system = { wrapErrorHint(res); // if(res.Code === 0) { notify.success(`${archName} 更新成功`); } if(isConflict) { // 若选择远端文件为服务器最新commit, 则输出回本地的copyFile需要将ipfsCid换成本地提交的commit - copyFile.ipfsCid = hash; - copyFile.size = +size; + copyFile.IpfsCid = hash; + copyFile.Size = +size; } onSuccessHandler(copyFile); return;