修改更新源为aotu

Author: JChehe

app/ipcMainSets.js

@@ -15,7 +15,7 @@ let savePath = '',
 		updateWindow,
 		updateItem,
 		downloadsFullPath
-console.log(version)
+		
 shortid.characters('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$@')
 
 module.exports = function(mainWindow, backgroundWindow) {
@@ -63,7 +63,6 @@ module.exports = function(mainWindow, backgroundWindow) {
 						console.log(`Download failed: ${state}`)
 					}
 					item.removeAllListeners()
-					updateItem.removeAllListeners()
 					updateItem = null
 					item = null
 				})
@@ -81,6 +80,8 @@ module.exports = function(mainWindow, backgroundWindow) {
 	  var win = new BrowserWindow({
 	    height: 160,
 	    width: 550,
+	    minWidth: 550,
+			minHeight: 160,
 	    title: '下载最新版的XCel',
 	    backgroundColor: "#f5f5f5"
 	  })

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "xcel",
   "product": "XCel",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "An ultimate excel data filter",
   "author": "AOTULabs <[email protected]>",
   "main": "electron.js",

app/src/components/common/Footer.vue

@@ -46,7 +46,7 @@
 	import request from 'request'
 	import compareVersions from 'compare-versions'
 	import { openExternal } from '../../utils/openExternal'
-	import { appInfo } from '../../utils/appInfo'
+	import { appInfo, getDownloadUrl } from '../../utils/appInfo'
 	import { 
 		getSideBarStatus,
 		getFilterPanelStatus,
@@ -139,7 +139,7 @@
 			},
 			checkUpdate(isClick) {
         let that = this
-        
+        console.log(appInfo.updateUrl)
         request({
           url: appInfo.updateUrl,
           method: 'GET'
@@ -158,8 +158,13 @@
 	             */
 	            let compareResult = compareVersions(appInfo.app_version, res.name)
 	            if(compareResult === -1) {
+	            	// 由于 github 对于国内用户下载速度太慢，所以要切换至国内
+	            	let downloadUrl = getDownloadUrl(res.name)
+	            	if(downloadUrl === undefined) {
+	            		downloadUrl = res.url
+	            	}
 	              that.toggleUpdateDialog(true)
-	              that.setUpdateUrl(res.url)
+	              that.setUpdateUrl(downloadUrl)
 	              that.setUpdateVersion(res.name)
 	              that.setUpdateNotes(res.notes)
 	              that.setUpdatePubDate(res.pub_date)

app/src/components/common/UpdateDialog.vue

@@ -118,7 +118,7 @@
 		left: 50%;
 		transform: translate(-50%, -80%);
 		width: 500px;
-		height: 320px;
+		height: 400px;
 		background-color: #fff;
 		box-shadow: 0 2px 4px rgba(0,0,0,.5);
 		display: flex;
@@ -149,18 +149,18 @@
 		&_content {
 			.has_new & {
 				display: flex;
-				max-height: 210px;
 			}
 			.no_new & {
+				padding: 15px 20px;
 				p {
 					margin-bottom: 10px;
 				}
 			}
 			
 			overflow: auto;
 			flex-grow: 1;
-			flex-shrink: 0;
-			padding: 15px 20px;
+			flex-shrink: 1;
+			padding: 0 20px;
 			position: relative;
 		}
 		&_footer {

app/src/utils/appInfo.js

@@ -5,15 +5,20 @@ import os from 'os'
 import path from 'path'
 import packageJSON from '../../package.json'
 
+const UPDATE_HOST = 'http://nuts-xcel.aotu.io/'
+const UPDATE_HOST_DEV = 'http://nuts-xcel.aotu.io/'
+
+const DOWNLOAD_HOST = 'http://jdc.jd.com/lab/xcel/download/'
 
 // dev 时显示了 app.getName()、app.getVersion()都返回Electron的信息，但打包后正常
 let app = remote.app,
 		isDev = process.env.NODE_ENV === 'development',
 		app_version = isDev ? packageJSON.version : app.getVersion(),
 		name = isDev ? packageJSON.name : app.getName(),
-		platform = os.platform() + '_' + os.arch(),
-		updateUrl = isDev ? 'http://localhost:5000/update/'+platform+'/'+app_version
-											: 'http://localhost:5000/update/'+platform+'/'+app_version
+		platform = os.platform(),
+		arch = os.arch(),
+		updateUrl = isDev ? UPDATE_HOST_DEV+'update/'+ platform + '_' + arch +'/'+app_version
+											: UPDATE_HOST+'update/'+ platform + '_' + arch +'/'+app_version
 
 export const appInfo = {
 	platform,
@@ -22,5 +27,27 @@ export const appInfo = {
 	ele_version: process.versions.electron, // electron 版本
 	chrome_version: process.versions.chrome, // chrome 版本
 	locales: app.getLocale(), // 本地化
-	updateUrl
-}
+	updateUrl,
+	downloadUrl: DOWNLOAD_HOST
+};
+
+
+export function getDownloadUrl(version) {
+		let prefix = `${DOWNLOAD_HOST}${version}/`
+		if(platform === 'darwin') {
+			return `${prefix}${name}-${version}.dmg`
+		} else if(platform === 'win32') {
+			if(arch === 'ia32' || arch === 'x86') {
+				return `${prefix}${name} Setup ${version}-ia32.exe`
+			} else if(arch === 'x64') {
+				return `${prefix}${name} Setup ${version}.exe`
+			}
+		} else if(platform === 'linux') {
+			if(arch === 'ia32' || arch === 'x86') {
+				return `${prefix}${name}-${version}-linux-ia32.zip`
+			} else if(arch === 'x64') {
+				return `${prefix}${name}-${version}-linux-x64.zip`
+			}
+		}
+		return undefined
+	}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcel",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "An ultimate excel data filter",
   "scripts": {
     "build": "node tasks/release.js",
@@ -14,7 +14,7 @@
     "vue:route": "node tasks/vue/route.js",
     "pack_ori:electron-packager": "cross-env NODE_ENV=production webpack -p --progress --colors",
     "pack": "build --dir",
-    "dist": "build -mwl"
+    "dist": "build -mwl --ia32 --x64"
   },
   "build": {
     "appId": "com.electron.xcel",