Merge branch 'master' into ee_dev

package.json

@@ -8,11 +8,20 @@
     "dev": "electron . --env=local",
     "reload": "nodemon --config ./electron/config/nodemon.json",
     "test": "set DEBUG=* && electron . --env=local",
-    "build-w": "electron-builder -w --ia32",
-    "build-w-64": "electron-builder -w --x64",
+    "build-w": "electron-builder -w=nsis --ia32",
+    "build-w-64": "electron-builder -w=nsis --x64",
+    "build-w-arm64": "electron-builder -w=nsis --arm64",
+    "build-wz": "electron-builder -w=7z --ia32",
+    "build-wz-64": "electron-builder -w=7z --x64",
+    "build-wz-arm64": "electron-builder -w=7z --arm64",
     "build-m": "electron-builder -m",
     "build-m-arm64": "electron-builder -m --arm64",
-    "build-l": "electron-builder -l",
+    "build-l": "electron-builder -l=deb --ia32",
+    "build-l-64": "electron-builder -l=deb --x64",
+    "build-l-arm64": "electron-builder -l=deb --arm64",
+    "build-l-armv7l": "electron-builder -l=deb --armv7l",
+    "build-lr-64": "electron-builder -l=rpm --x64",
+    "build-lp-64": "electron-builder -l=pacman --x64",
     "rd": "ee-core rd --dist_dir=./frontend/dist",
     "encrypt": "ee-core encrypt",
     "rebuild": "electron-rebuild",

update.md

@@ -1,3 +1,11 @@
+## 2.2.1
+1. 增加http服务请求过滤配置
+2. 优化http服务开启后，浏览器默认请求报错
+3. 将开发环境热启动配置加入config
+4. 构建包支持windows免安装版、arm64版
+5. 构建包支持linux arm64版、armv7l版、rpm包、pacman包
+6. 关闭上下文隔离配置
+
 ## 2.2.0
 1. 修复加密配置