Merge remote-tracking branch 'origin/master'

packages/core/src/config/index.js

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

packages/core/src/shell/scripts/kill-by-port.js

@@ -9,11 +9,11 @@ const executor = {
     return true
   },
   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
   },
   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
   }
 }