From d185be5f342fe8b6918b843dcb50049b47176007 Mon Sep 17 00:00:00 2001 From: Suwings Date: Tue, 3 Mar 2020 16:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=81=97=E7=95=99?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- route/websocket/console.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/route/websocket/console.js b/route/websocket/console.js index 0cfa1725..1689e946 100644 --- a/route/websocket/console.js +++ b/route/websocket/console.js @@ -65,7 +65,7 @@ serverModel.ServerManager().on('open', (data) => { }); // 为此服务端创建历史记录类 - const serverInstance = serverModel.ServerManager().getServer(serverName); + const serverInstance = serverModel.ServerManager().getServer(data.serverName); serverInstance.logHistory = new LogHistory(data.serverName); // 仅发送给正在监听控制台的用户 @@ -117,9 +117,9 @@ setInterval(() => { let data = consoleBuffer[serverName]; // 记录日志历史记录 const logHistory = serverModel.ServerManager().getServer(serverName).logHistory; - if (logHistory) { - logHistory.writeLine(data) - } + + logHistory.writeLine(data) + // 发送前端的标准,前端只识别 \r\n ,不可是\n data = data.replace(/\n/gim, '\r\n'); data = data.replace(/\r\r\n/gim, '\r\n');