From 27b97a4db9b687e3e5fc075c6a7a9242982de949 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 6 Dec 2021 00:26:34 +0800 Subject: [PATCH] build: update --- packages/core/package.json | 2 +- packages/gui/package.json | 2 +- packages/gui/src/bridge/update/front.js | 16 +++++++++++++++- packages/mitmproxy/package.json | 2 +- packages/mitmproxy/test/sha256Test.js | 3 +++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 4196647a..55a8ae47 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -78,5 +78,5 @@ "last 2 versions", "not dead" ], - "gitHead": "9b027af3ee7e88975a54692ed83096802764a8dc" + "gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e" } diff --git a/packages/gui/package.json b/packages/gui/package.json index af80d02b..5ef9b3f0 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -84,5 +84,5 @@ "not dead" ], "__npminstall_done": false, - "gitHead": "9b027af3ee7e88975a54692ed83096802764a8dc" + "gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e" } diff --git a/packages/gui/src/bridge/update/front.js b/packages/gui/src/bridge/update/front.js index ad0254e2..281d94d0 100644 --- a/packages/gui/src/bridge/update/front.js +++ b/packages/gui/src/bridge/update/front.js @@ -76,14 +76,28 @@ function install (app, api) { } }) } + + /** + * 是否小版本升级 + * @param version1 + * @param version2 + * @returns {Promise} + */ + async function isMiniUpdate (version1, version2) { + const version1Prefix = version1.substring(0, version1.lastIndexOf('.')) + const version2Prefix = version2.substring(0, version1.lastIndexOf('.')) + return version1Prefix === version2Prefix + } async function downloadNewVersion (value) { const platform = await api.shell.getSystemPlatform() + const info = await this.$api.info.get() console.log('download new version platform', platform) if (platform === 'linux') { goManualUpdate(app, value) return } - if (value.partPackage) { + const usePartPackage = value.partPackage && isMiniUpdate(value.version, info.version) + if (usePartPackage) { // 有增量更新 api.update.downloadPart(value) } else { diff --git a/packages/mitmproxy/package.json b/packages/mitmproxy/package.json index 40f4748d..b9980b89 100644 --- a/packages/mitmproxy/package.json +++ b/packages/mitmproxy/package.json @@ -66,5 +66,5 @@ "last 2 versions", "not dead" ], - "gitHead": "9b027af3ee7e88975a54692ed83096802764a8dc" + "gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e" } diff --git a/packages/mitmproxy/test/sha256Test.js b/packages/mitmproxy/test/sha256Test.js index 9dd9293e..54c82b51 100644 --- a/packages/mitmproxy/test/sha256Test.js +++ b/packages/mitmproxy/test/sha256Test.js @@ -2,3 +2,6 @@ const CryptoJs = require('crypto-js') const ret = CryptoJs.SHA256('111111111111') console.log(ret.toString(CryptoJs.enc.Base64)) console.log(1 / 2) + +const version1 = '1.7.0' +console.log(version1.substring(0, version1.lastIndexOf('.')))