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

Merge pull request #2394 from jumpserver/dev 

Dev
pull/2486/head
老广 2019-02-15 11:16:54 +08:00 committed by GitHub
parent 041edb6177 49404f763d
commit 19be7ac580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ops/templates/ops/command_execution_create.html
View File

@ -170,7 +170,7 @@ function initResultTerminal() {
term = new Terminal({ term = new Terminal({
cursorBlink: false, cursorBlink: false,
screenKeys: false, screenKeys: false,
fontFamily: '"Consolas", "monospace"', fontFamily: 'monaco, Consolas, "Lucida Console", monospace',
fontSize: 14, fontSize: 14,
rightClickSelectsWord: true, rightClickSelectsWord: true,
disableStdin: true, disableStdin: true,

9
apps/terminal/models.py
View File

@ -168,7 +168,7 @@ class Session(OrgModelMixin):
upload_to = 'replay' upload_to = 'replay'
ACTIVE_CACHE_KEY_PREFIX = 'SESSION_ACTIVE_{}' ACTIVE_CACHE_KEY_PREFIX = 'SESSION_ACTIVE_{}'
def get_rel_replay_path(self, version=3): def get_rel_replay_path(self, version=2):
""" """
获取session日志的文件路径 获取session日志的文件路径
:param version: 原来后缀是 .gz，为了统一新版本改为 .replay.gz :param version: 原来后缀是 .gz，为了统一新版本改为 .replay.gz
@ -177,13 +177,10 @@ class Session(OrgModelMixin):
suffix = '.replay.gz' suffix = '.replay.gz'
if version == 1: if version == 1:
suffix = '.gz' suffix = '.gz'
if version <= 2: date = self.date_start.strftime('%Y-%m-%d')
date = self.date_start.strftime('%Y-%m-%d')
else:
date = self.date_start.utcnow().strftime('%Y-%m-%d')
return os.path.join(date, str(self.id) + suffix) return os.path.join(date, str(self.id) + suffix)
def get_local_path(self, version=3): def get_local_path(self, version=2):
rel_path = self.get_rel_replay_path(version=version) rel_path = self.get_rel_replay_path(version=version)
if version == 2: if version == 2:
local_path = os.path.join(self.upload_to, rel_path) local_path = os.path.join(self.upload_to, rel_path)

4
config_example.yml
View File

@ -18,8 +18,8 @@ BOOTSTRAP_TOKEN:
# Session expiration setting, Default 24 hour, Also set expired on on browser close # Session expiration setting, Default 24 hour, Also set expired on on browser close
# 浏览器Session过期时间，默认24小时, 也可以设置浏览器关闭则过期 # 浏览器Session过期时间，默认24小时, 也可以设置浏览器关闭则过期
# SESSION_COOKIE_AGE: 3600 * 24 # SESSION_COOKIE_AGE: 86400
# SESSION_EXPIRE_AT_BROWSER_CLOSE: False # SESSION_EXPIRE_AT_BROWSER_CLOSE: false
# Database setting, Support sqlite3, mysql, postgres .... # Database setting, Support sqlite3, mysql, postgres ....
# 数据库设置 # 数据库设置