Merge branch 'master' into ee_dev

# Conflicts:
#	package.json

electron/controller/example.js

@@ -630,4 +630,5 @@ class ExampleController extends Controller {
   }   
 }
 
+ExampleController.toString = () => '[class ExampleController]';
 module.exports = ExampleController;

electron/service/example.js

@@ -25,4 +25,5 @@ class ExampleService extends Service {
   }
 }
 
+ExampleService.toString = () => '[class ExampleService]';
 module.exports = ExampleService;

electron/service/storage.js

@@ -228,4 +228,5 @@ class StorageService extends Service {
   }  
 }
 
+StorageService.toString = () => '[class StorageService]';
 module.exports = StorageService;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "A fast, desktop software development framework",
   "main": "main.js",
   "scripts": {
@@ -16,7 +16,7 @@
     "rd": "ee-core rd --dist_dir=./frontend/dist",
     "compress": "ee-core compress",
     "restore": "ee-core restore",
-    "encrypt": "ee-core encrypt --type=confuse",
+    "encrypt": "ee-core encrypt --type=bytecode",
     "rebuild": "electron-rebuild",
     "re-sqlite": "electron-rebuild -f -w better-sqlite3"
   },
@@ -46,7 +46,8 @@
       "!frontend/",
       "!run/",
       "!logs/",
-      "!data/"
+      "!data/",
+      "!electron/"
     ],
     "extraResources": {
       "from": "./build/extraResources/",
@@ -116,7 +117,7 @@
   },
   "dependencies": {
     "dayjs": "^1.10.7",
-    "ee-core": "^1.2.9",
+    "ee-core": "^1.2.10",
     "electron-is": "^3.0.0",
     "lodash": "^4.17.21"
   }

update.md

@@ -1,3 +1,11 @@
+## 2.1.8
+1. 安全性更新
+2. 支持bytecode字节码加密
+3. 优化压缩混淆加密
+4. 将废弃compress、restore命令，使用encrypt替代
+5. mainServer增加option支持
+6. 限制控制器业务必须为class文件
+
 ## 2.1.7
 1. 增加ssl，支持https
 2. 优化http服务的路由写法