Merge remote-tracking branch 'origin/developer' into developer

byit-myth-core/myth-executor-core/src/main/java/com/byit/executor/jobExecutor/process/MythJobProcess.java

@@ -107,8 +107,8 @@ public class MythJobProcess implements Callable<String>{
                 log.info("进程的id " + this.processId);
             }
 
-            outputGobbler = new LogGobbler(new InputStreamReader(this.process.getInputStream(), "GB2312"), Boolean.FALSE, 30);
-            errorGobbler = new LogGobbler(new InputStreamReader(this.process.getErrorStream(), "GB2312"), Boolean.TRUE, 30);
+            outputGobbler = new LogGobbler(new InputStreamReader(this.process.getInputStream(), "utf-8"), Boolean.FALSE, 30);
+            errorGobbler = new LogGobbler(new InputStreamReader(this.process.getErrorStream(), "utf-8"), Boolean.TRUE, 30);
             //开始获取进程的运行日志
             outputGobbler.start();
             errorGobbler.start();

byit-myth-core/myth-executor-core/src/main/java/com/byit/executor/util/LogGobbler.java

@@ -62,8 +62,7 @@ public class LogGobbler extends Thread {
         }
     }
 
-    public String getRecentLog() throws UnsupportedEncodingException {
+    public String getRecentLog() {
         return buffer.toString();
     }
-
 }