Merge remote-tracking branch 'origin/master'

# Conflicts:
#	packages/gui/src/view/pages/proxy.vue

packages/gui/build/installer.nsh

@@ -1,4 +1,4 @@
 !macro customUnInit
-  MessageBox MB_OK "请务必先手动右键小图标退出DevSidecar之后再进行下一步↘↘↘↘↘↘↘↘↘"
+  MessageBox MB_OK "卸载前请务必手动右键小图标退出DevSidecar之后,再进行下一步↘↘↘↘↘↘↘↘↘"
   ExecWait '"$INSTDIR\resources\extra\sysproxy.exe" set 1'
 !macroend

packages/gui/src/view/pages/proxy.vue

@@ -70,11 +70,13 @@ export default {
   data () {
     return {
       key: 'proxy',
-      loopbackVisible: false
+      loopbackVisible: false,
+      systemPlatform: ''
     }
   },
-  created () {
-
+  async created () {
+    const platform = await this.$api.info.getSystemPlatform()
+    this.systemPlatform = platform
   },
   mounted () {
   },

packages/gui/vue.config.js

@@ -63,9 +63,10 @@ module.exports = {
         },
         mac: {
           icon: './build/mac/icon.icns',
-          target: [
-            'dmg'
-          ]
+          target: {
+            arch: 'universal',
+            target: 'dmg'
+          }
         },
         win: {
           icon: 'build/icons/'