fixed auto-updater bug

o2team · Feb 17, 2017 · d9a5e6a · d9a5e6a
1 parent 2dcc212
commit d9a5e6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/app/ipcMainSets.js b/app/ipcMainSets.js
@@ -30,6 +30,7 @@ module.exports = function(mainWindow, backgroundWindow) {
 				updateItem = item
 				downloadsFullPath = downloadsPath + item.getFilename()
 				item.setSavePath(downloadsFullPath)
+				console.log(downloadsFullPath)
 				console.log('getTotalBytes', item.getTotalBytes())
 				item.on('updated', (event, state) => {
 					if(state === 'interrupted') {
@@ -67,12 +68,11 @@ module.exports = function(mainWindow, backgroundWindow) {
 					item = null
 				})
 			})
+			console.log('uodate.url', arg.url)
 			if(process.env.NODE_ENV === 'development') {
 				updateWindow.webContents.downloadURL(arg.url)
-				console.log(arg.url)
-				// updateWindow.webContents.downloadURL('https://jdc.jd.com/lab/xcel/xcel/XCel-darwin-x64.zip')
 			} else {
-				// updateWindow.webContents.downloadURL()
+				updateWindow.webContents.downloadURL(arg.url)
 			}
 		}
 	})

diff --git a/app/src/components/common/Footer.vue b/app/src/components/common/Footer.vue
@@ -159,14 +159,18 @@
           	if(statusCode === 200) {
 	            let res = JSON.parse(response.body)
 	            /**
-	             * -1即小于，表示当前版本比服务器上的版本还要新
+	             *  1即小于，表示当前版本比服务器上的版本还要新
 	             *  0即等于，表示已是最新版
-	             *  1即大于，表示有更新版本
+	             *  -1即大于，表示有更新版本
 	             */
 	            let compareResult = compareVersions(appInfo.app_version, res.name)
+	            console.log('compareResult', compareResult)
+	            console.log('appInfo.app_version', appInfo.app_version)
+	            console.log('res.name', res.name)
 	            if(compareResult === -1) {
 	            	// 由于 github 对于国内用户下载速度太慢，所以要切换至国内
 	            	let downloadUrl = getDownloadUrl(res.name)
+	            	console.log(downloadUrl)
 	            	if(downloadUrl === undefined) {
 	            		downloadUrl = res.url
 	            	}