Merge branch 'refs/heads/feat-shell-runtime' into release

service/shellService.go

@@ -83,7 +83,7 @@ func ShellWillRunFromServer() {
 		//执行时间,转成秒
 		shellRuntime := time.Since(start).Seconds()
 		if err2 != "" {
-			resp = append(resp, proto.UpdateShellReq{ID: v.ID, Server: v.Server, Status: 3, ShellResult: err2, ShellRuntime: shellRuntime}) //执行出错
+			resp = append(resp, proto.UpdateShellReq{ID: v.ID, Server: v.Server, Status: 3, ShellResult: "err:" + err2 + "\nresult:" + res, ShellRuntime: shellRuntime}) //执行出错
 		} else {
 			resp = append(resp, proto.UpdateShellReq{ID: v.ID, Server: v.Server, Status: 2, ShellResult: res, ShellRuntime: shellRuntime}) //执行成功
 		}