github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

udpate

pull/123/head
liuzheng712 2016-03-15 14:53:30 +08:00
parent 9b3a51469e
commit 31708c0d24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
run_server.py
View File

@ -413,8 +413,8 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
self.term.vim_data += recv
try:
print chardet.detect(data)
if chardet.detect(data).encoding == 'GB2312':
data = data.encode('gbk').decode('utf8')
if chardet.detect(data)['encoding'] == 'GB2312':
data = data.decode('gb2312').encode('utf8')
self.write_message(data)
now_timestamp = time.time()
self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))