Merge branch 'master' into v2.0.x

modules/request.js

@@ -122,12 +122,12 @@ class Request {
         }, res, callback);
       })
       .end((err, ret) => {
-        if (err) {
-          return event.sender.send('request-error-' + opts['hash'], err);
-        };
         let buff = ret.body;
         // 解码
         let text = iconv.decode(buff, opts['encode']);
+        if (err && text == "") {
+          return event.sender.send('request-error-' + opts['hash'], err);
+        };
         // 回调数据
         event.sender.send('request-' + opts['hash'], {
           text: text,

source/core/php/index.js

@@ -51,7 +51,7 @@ class PHP extends Base {
 
     // 组合完整的代码
     let tmpCode = data['_'];
-    data['_'] = `@ini_set("display_errors", "0");@set_time_limit(0);header('HTTP/1.1 200 OK');echo "${tag_s}";${tmpCode};echo "${tag_e}";die();`;
+    data['_'] = `@ini_set("display_errors", "0");@set_time_limit(0);echo "${tag_s}";${tmpCode};echo "${tag_e}";die();`;
 
     // 使用编码器进行处理并返回
     return this.encodeComplete(tag_s, tag_e, data);

source/modules/terminal/index.js

@@ -215,11 +215,11 @@ class Terminal {
             ]
           )
         },
-        keypress: (event, terminal) => {
+        keydown: (event, terminal) => {
           if(event.ctrlKey == true) {
             // ctrl 键按下
             switch(event.keyCode) {
-              case 61: // 放大 ctrl +
+              case 187: // 放大 ctrl +
                 var s = parseFloat(terminal[0].style.getPropertyValue("--size"));
                 if(isNaN(s)){
                   s = 1;
@@ -229,7 +229,7 @@ class Terminal {
                 }
                 terminal[0].style.setProperty("--size", s);
                 return false;
-              case 31: // 缩小 ctrl -
+              case 189: // 缩小 ctrl -
                 var s = parseFloat(terminal[0].style.getPropertyValue("--size"));
                 if(isNaN(s)){
                   s = 1;