Merge remote-tracking branch 'origin/master'

pull/88/head 1.6.0
xiaojunnuo 2021-08-18 23:52:59 +08:00
commit ed239377ec
2 changed files with 12 additions and 12 deletions

View File

@ -212,18 +212,18 @@ module.exports = {
// 'assets.fastgit.org': 'usa', // 'assets.fastgit.org': 'usa',
'*amazonaws.com': 'quad9', '*amazonaws.com': 'quad9',
'*githubusercontent.com': 'quad9', '*githubusercontent.com': 'quad9',
'*yarnpkg.com': 'usa', '*yarnpkg.com': 'quad9',
'*cloudfront.net': 'usa', '*cloudfront.net': 'quad9',
'*github.io': 'usa', '*github.io': 'quad9',
'img.shields.io': 'usa', 'img.shields.io': 'quad9',
'*.githubusercontent.com': 'usa', '*.githubusercontent.com': 'quad9',
'*.githubassets.com': 'usa', '*.githubassets.com': 'quad9',
// "解决push的时候需要输入密码的问题", // "解决push的时候需要输入密码的问题",
'github.com': 'quad9', 'github.com': 'quad9',
'*github.com': 'usa', '*github.com': 'quad9',
'*.vuepress.vuejs.org': 'usa', '*.vuepress.vuejs.org': 'quad9',
'gh.docmirror.top': 'aliyun', 'gh.docmirror.top': 'quad9',
'*cloudflare.com': 'usa', '*cloudflare.com': 'quad9',
'*v2ex.com': 'quad9' '*v2ex.com': 'quad9'
}, },
speedTest: { speedTest: {

View File

@ -9,11 +9,11 @@ const executor = {
return true return true
}, },
async linux (exec, { port }) { async linux (exec, { port }) {
await exec('kill `lsof -i:' + port + " |grep 'dev-sidecar\\|electron' |awk '{print $2}'`") await exec('kill `lsof -i:' + port + " |grep 'dev-sidecar\\|electron\\|@docmirro' |awk '{print $2}'`")
return true return true
}, },
async mac (exec, { port }) { async mac (exec, { port }) {
await exec('kill `lsof -i:' + port + " |grep 'DevSide\\|Elect' |awk '{print $2}'`") await exec('kill `lsof -i:' + port + " |grep 'dev-side\\|Elect' |awk '{print $2}'`")
return true return true
} }
} }