Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ

jumpserver.conf

+#coding: utf8
+
+[base]
+url = http://127.0.0.1
+key = 88aaaf7ffe3c6c04
+log = debug
+
+[db]
+host = 127.0.0.1
+port = 3306
+user = jumpserver
+password = mysql234
+database = jumpserver
+
+[websocket]
+web_socket_host = j:3000
+
+[mail]
+mail_enable = 1
+email_host = smtp.exmail.qq.com
+email_port = 25
+email_host_user = noreply@jumpserver.org
+email_host_password = jumpserver1234
+email_use_tls = True

run_websocket.py

@@ -236,7 +236,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
         if data.get('data'):
             self.term.input_mode = True
             if str(data['data']) in ['\r', '\n', '\r\n']:
-                TtyLog(log=self.log, datetime=datetime.datetime.now(), cmd=self.term.remove_control_char(self.term.data)).save()
+                TtyLog(log=self.log, datetime=datetime.datetime.now(), cmd=self.term.deal_command(self.term.data, self.term.ssh)).save()
                 self.term.data = ''
                 self.term.input_mode = False
             self.term.channel.send(data['data'])