张恒

修改自动更新部分

......@@ -4903,8 +4903,8 @@
},
"electron": {
"version": "6.1.0",
"resolved": "https://registry.npm.taobao.org/electron/download/electron-6.1.0.tgz?cache=0&sync_timestamp=1571709934231&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-6.1.0.tgz",
"integrity": "sha1-+BY0fMCyHLIxuCmkulEz+/u74QA=",
"resolved": "https://registry.npmjs.org/electron/-/electron-6.1.0.tgz",
"integrity": "sha512-CGdM6671gA0WUmsQCVO3stqpvm6/x+S+MkKlqgsk2N3GXnIa3KkfR8k4YNp8gnCgLSZQ0yucFQB/DyEYSjrzrA==",
"dev": true,
"requires": {
"@types/node": "^10.12.18",
......@@ -4914,8 +4914,8 @@
"dependencies": {
"@types/node": {
"version": "10.14.22",
"resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-10.14.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-10.14.22.tgz",
"integrity": "sha1-NLzfa2y1/A2zPSSBatnT7OIv7qQ=",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.22.tgz",
"integrity": "sha512-9taxKC944BqoTVjE+UT3pQH0nHZlTvITwfsOZqyc+R3sfJuxaTtxWjfn1K2UlxyPcKHf0rnaXcVFrS9F9vf0bw==",
"dev": true
}
}
......@@ -4968,8 +4968,8 @@
},
"electron-download": {
"version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/electron-download/download/electron-download-4.1.1.tgz",
"integrity": "sha1-AuaVVnBcxFblIPngNVVu1aAV6+g=",
"resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
"integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
"dev": true,
"requires": {
"debug": "^3.0.0",
......@@ -4985,7 +4985,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}
......@@ -5985,7 +5985,7 @@
},
"extract-zip": {
"version": "1.6.7",
"resolved": "https://registry.npm.taobao.org/extract-zip/download/extract-zip-1.6.7.tgz",
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
"integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
"dev": true,
"requires": {
......@@ -5997,8 +5997,8 @@
"dependencies": {
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
"integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"dev": true,
"requires": {
"ms": "2.0.0"
......@@ -6081,7 +6081,7 @@
},
"fd-slicer": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/fd-slicer/download/fd-slicer-1.0.1.tgz",
"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
"dev": true,
"requires": {
......@@ -6436,8 +6436,8 @@
},
"fs-extra": {
"version": "4.0.3",
"resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-4.0.3.tgz",
"integrity": "sha1-DYUhIuW8W+tFP7Ao6cDJvzY0DJQ=",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.2",
......@@ -9772,7 +9772,7 @@
},
"nugget": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/nugget/download/nugget-2.0.1.tgz",
"resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
"integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
"dev": true,
"requires": {
......@@ -9787,8 +9787,8 @@
"dependencies": {
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
"integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"dev": true,
"requires": {
"ms": "2.0.0"
......@@ -9796,7 +9796,7 @@
},
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}
......@@ -10320,7 +10320,7 @@
},
"pend": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/pend/download/pend-1.2.0.tgz",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
"dev": true
},
......@@ -10634,7 +10634,7 @@
},
"pretty-bytes": {
"version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/pretty-bytes/download/pretty-bytes-1.0.4.tgz",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
"integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
"dev": true,
"requires": {
......@@ -10678,7 +10678,7 @@
},
"progress-stream": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/progress-stream/download/progress-stream-1.2.0.tgz",
"resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
"integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
"dev": true,
"requires": {
......@@ -10688,19 +10688,19 @@
"dependencies": {
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz?cache=0&sync_timestamp=1562592096220&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fisarray%2Fdownload%2Fisarray-0.0.1.tgz",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
},
"object-keys": {
"version": "0.4.0",
"resolved": "https://registry.npm.taobao.org/object-keys/download/object-keys-0.4.0.tgz",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
"integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
"dev": true
},
"readable-stream": {
"version": "1.1.14",
"resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-1.1.14.tgz",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"dev": true,
"requires": {
......@@ -10712,13 +10712,13 @@
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npm.taobao.org/string_decoder/download/string_decoder-0.10.31.tgz?cache=0&sync_timestamp=1565170823020&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring_decoder%2Fdownload%2Fstring_decoder-0.10.31.tgz",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
"dev": true
},
"through2": {
"version": "0.2.3",
"resolved": "https://registry.npm.taobao.org/through2/download/through2-0.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrough2%2Fdownload%2Fthrough2-0.2.3.tgz",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
"integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
"dev": true,
"requires": {
......@@ -10728,7 +10728,7 @@
},
"xtend": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/xtend/download/xtend-2.1.2.tgz",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
"integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
"dev": true,
"requires": {
......@@ -12014,7 +12014,7 @@
},
"single-line-log": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/single-line-log/download/single-line-log-1.1.2.tgz",
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
"integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
"dev": true,
"requires": {
......@@ -12405,7 +12405,7 @@
},
"speedometer": {
"version": "0.1.4",
"resolved": "https://registry.npm.taobao.org/speedometer/download/speedometer-0.1.4.tgz",
"resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz",
"integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=",
"dev": true
},
......@@ -12725,7 +12725,7 @@
},
"sumchecker": {
"version": "2.0.2",
"resolved": "https://registry.npm.taobao.org/sumchecker/download/sumchecker-2.0.2.tgz",
"resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
"integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
"dev": true,
"requires": {
......@@ -12734,8 +12734,8 @@
"dependencies": {
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
"integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"dev": true,
"requires": {
"ms": "2.0.0"
......@@ -13243,7 +13243,7 @@
},
"throttleit": {
"version": "0.0.2",
"resolved": "https://registry.npm.taobao.org/throttleit/download/throttleit-0.0.2.tgz",
"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
"integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
"dev": true
},
......@@ -15308,7 +15308,7 @@
},
"yauzl": {
"version": "2.4.1",
"resolved": "https://registry.npm.taobao.org/yauzl/download/yauzl-2.4.1.tgz",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
"dev": true,
"requires": {
......
......@@ -23,13 +23,9 @@
"publish": [
{
"provider": "generic",
"url": "http://127.0.0.1:25565/"
"url": "http://127.0.0.1"
}
],
"nsis": {
"oneClick": false,
"allowToChangeInstallationDirectory": true
},
"productName": "electron-vue-admin",
"appId": "org.simulatedgreg.electron-vue",
"directories": {
......@@ -57,7 +53,16 @@
"icon": "build/icons/icon.icns"
},
"win": {
"icon": "build/icons/icon.ico"
"icon": "build/icons/icon.ico",
"target": [
{
"target": "nsis",
"arch": [
"x64",
"ia32"
]
}
]
},
"linux": {
"icon": "build/icons"
......
version: 6.0.13
version: 6.1.1
files:
- url: electron-vue-admin Setup 0.0.1.exe
sha512: 6higqp9mFJANIRdE59Cyl/3CgaWuHZU92EaRUfwTjXPi9b/OH/ndiLNhK8AgWB9JIz57xBwnmgXl+eT0xAjUGw==
......
var express = require('express')
var fs = require('fs')
const path = require('path')
var app = express()
app.use(express.static(path.join(__dirname, './client')))
var server = app.listen(25565, function () {
var host = server.address().address;
var port = server.address().port;
var host = server.address().address
var port = server.address().port
console.log('Example app listening at http://%s:%s', host, port);
});
\ No newline at end of file
console.log('服务启动', host, port)
})
......
......@@ -19,8 +19,10 @@ export default {
// 当更新发生错误的时候触发。
autoUpdater.on('error', (err) => {
console.log('更新出现错误')
console.log(err)
Message(mainWindow, -1, err)
console.log(err.message)
if (err.message.includes('sha512 checksum mismatch')) {
Message(mainWindow, -1, 'sha512校验失败')
}
})
// 当开始检查更新的时候触发
......@@ -53,7 +55,9 @@ export default {
})
// 执行自动更新检查
ipcMain.on('check-update', () => {
autoUpdater.checkForUpdates()
autoUpdater.checkForUpdates().catch(err => {
console.log('网络连接问题', err)
})
})
// 渲染进程执行更新操作
ipcMain.on('confirm-update', () => {
......
......@@ -116,8 +116,7 @@ export default {
switch (data.state) {
case -1:
const msgdata = {
title: "警告",
message: "更新检查失败!"
title: data.msg,
};
api.MessageBox(dialog, msgdata);
break;
......