Merge branch 'master' into ee_dev

# Conflicts:
#	package.json

package.json

@@ -12,7 +12,7 @@
     "build-w-64": "electron-builder -w --x64",
     "build-m": "electron-builder -m",
     "build-m-arm64": "electron-builder -m --arm64",
-    "build-l": "electron-builder -l deb tar.xz",
+    "build-l": "electron-builder -l",
     "rd": "node ./node_modules/ee-core/bin/tools rd --dist_dir=./frontend/dist",
     "compress": "node ./node_modules/ee-core/bin/tools compress",
     "restore": "node ./node_modules/ee-core/bin/tools restore"
@@ -87,11 +87,12 @@
       ]
     },
     "linux": {
-      "icon": "./build/icons/256x256.png",
+      "icon": "./build/icons/icon.icns",
       "artifactName": "${productName}-linux-${version}.${ext}",
       "target": [
         "deb"
-      ]
+      ],
+      "category": "Utility"
     }
   },
   "repository": "https://github.com/wallace5303/ee.git",
@@ -103,7 +104,7 @@
   "devDependencies": {
     "debug": "^4.3.3",
     "electron": "^13.6.9",
-    "electron-builder": "22.10.4",
+    "electron-builder": "^23.0.3",
     "eslint": "^5.13.0",
     "eslint-config-egg": "^7.1.0",
     "eslint-plugin-prettier": "^3.0.1",

update.md

@@ -1,6 +1,9 @@
 ## 2.1.3
 1. 增加开发环境代码热重载
 2. 增加菜单栏配置属性
+3. 修复linux系统构建的deb包，安装后图标显示问题
+4. 升级electron-builder到23.0.3
+5. 升级ee-core到1.2.4
 
 ## 2.1.2
 1. ipc通信增加 invoke/handle 模型