diff --git a/route/websocket/console.js b/route/websocket/console.js index b1cee1d8..c059ce17 100644 --- a/route/websocket/console.js +++ b/route/websocket/console.js @@ -86,16 +86,11 @@ WebSocketObserver().listener('server/console/remove', (data) => { }); serverModel.ServerManager().on('console', (data) => { - // console.log('[' + data.serverName + '] >>> ' + data.msg); - - // serverModel.ServerManager(data.serverName) - // .terminLog().unshift(data.msg); let server = serverModel.ServerManager().getServer(data.serverName); let consoleData = data.msg.replace(/\n/gim, '
'); - //将输出载入历史记录 - server.terminalLog(consoleData); - // console.log(server.consoleLog.length); + //将输出载入历史记录 这里曾出现过 server 未定义bug,情况不明,已加保险 + if(server) server.terminalLog(consoleData); selectWebsocket(data.serverName, (socket) => { socket.send({ @@ -105,16 +100,9 @@ serverModel.ServerManager().on('console', (data) => { body: consoleData }); }); -}) +}); - -// require('./console/command'); -// require('./console/history'); -// require('./console/open'); -// require('./console/properties'); -// require('./console/console-info'); - const {autoLoadModule} = require("../../core/tools"); autoLoadModule('route/websocket/console','console/',(path)=>{ require(path); diff --git a/route/websocket/genuser.js b/route/websocket/genuser.js index b698ff64..65fae8c2 100644 --- a/route/websocket/genuser.js +++ b/route/websocket/genuser.js @@ -71,7 +71,6 @@ WebSocketObserver().listener('genuser/re_password', (data) => { userCenter().rePassword(username, config.newPassword); userCenter().initUser(); response.wsMsgWindow(data.ws, '密码修改修改完成,请重新登陆!'); - data.ws.close(); } catch (err) { throw err; }