diff --git a/src/api/sessions.js b/src/api/sessions.js index 1ef2db725..c4c3e821d 100644 --- a/src/api/sessions.js +++ b/src/api/sessions.js @@ -8,24 +8,11 @@ export function terminateSession(data) { }) } -export function getSessionDetail(id) { +export function toggleLockSession(data) { return request({ - url: `/api/v1/terminal/sessions/${id}/`, - method: 'get' - }) -} - -export function getSessionCommands(id) { - return request({ - url: `/api/v1/terminal/commands/?session_id=${id}`, - method: 'get' - }) -} - -export function getTerminalDetail(id) { - return request({ - url: `/api/v1/terminal/terminals/${id}/`, - method: 'get' + url: '/api/v1/terminal/tasks/toggle-lock-session/', + method: 'post', + data: data }) } diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 60e62677f..5853d8260 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -1484,6 +1484,8 @@ "terminalUpdate": "Update terminal", "terminalUpdateStorage": "Update terminal storage", "terminate": "Terminate", + "resume": "Resume", + "pause": "Pause", "sessionTerminate": "Session Terminate", "test": "Test", "type": "Type", @@ -1499,6 +1501,8 @@ "RazorNotSupport": "RDP Client session not support now", "sessionMonitor": "Session Monitor", "TerminateTaskSendSuccessMsg": "Terminate task has been send, Please check later", + "PauseTaskSendSuccessMsg": "Pause task has been send, Please check later", + "ResumeTaskSendSuccessMsg": "Resume task has been send, Please check later", "helpText": { "esUrl": "Tip: If you have multiple hosts, use comma (, ) to split (eg: http://www.jumpserver.a.com, http://www.jumpserver.b.com)", "esIndex": "Es provides the default index: jumpserver. If you choose to build an index by date, this blank is the index prefix", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index f9e37425c..9f33e22e1 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -1479,6 +1479,8 @@ "terminalUpdate": "端末の更新", "terminalUpdateStorage": "端末ストレージの更新", "terminate": "終断", + "resume": "再開", + "pause": "一時停止", "sessionTerminate": "会話が終わる", "test": "テスト", "type": "タイプ", @@ -1494,6 +1496,8 @@ "RazorNotSupport": "RDPクライアントセッションは、監視をサポートしていません", "sessionMonitor": "モニタリング", "TerminateTaskSendSuccessMsg": "最終タスクが発行されました。後で更新して確認してください。", + "PauseTaskSendSuccessMsg": "一時停止タスクが発行されました。後で更新して確認してください。", + "ResumeTaskSendSuccessMsg": "再開タスクが発行されました。後で更新して確認してください。", "helpText": { "esUrl": "ヒント: 複数のホストがある場合は、カンマ ( , ) で分割します。 (Eg: http://www.jumpserver.a.com:3000、http://www.jumpserver.b.com:3000)", "esIndex": "Esはデフォルトindexを提供します。日付による索引の作成を選択した場合、この空は索引接頭辞です。", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index f2cebd320..1d64acb3c 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -1468,6 +1468,8 @@ "terminalUpdate": "更新终端", "terminalUpdateStorage": "更新终端存储", "terminate": "终断", + "resume": "恢复", + "pause": "暂停", "sessionTerminate": "会话终断", "test": "测试", "type": "类型", @@ -1483,6 +1485,8 @@ "RazorNotSupport": "RDP 客户端会话, 暂不支持监控", "sessionMonitor": "监控", "TerminateTaskSendSuccessMsg": "终断任务已下发,请稍后刷新查看", + "PauseTaskSendSuccessMsg": "暂停任务已下发,请稍后刷新查看", + "ResumeTaskSendSuccessMsg": "恢复任务已下发,请稍后刷新查看", "helpText": { "esUrl": "提示:如果有多台主机,请使用逗号 ( , ) 进行分割。(eg: http://www.jumpserver.a.com:3000,http://www.jumpserver.b.com:3000)", "esIndex": "es 提供默认 index:jumpserver。如果开启按日期建立索引,那么输入的值会作为索引前缀", diff --git a/src/views/sessions/SessionList/BaseList.vue b/src/views/sessions/SessionList/BaseList.vue index b24c596af..dfc03fad5 100644 --- a/src/views/sessions/SessionList/BaseList.vue +++ b/src/views/sessions/SessionList/BaseList.vue @@ -32,7 +32,8 @@ export default { min: ['id', 'actions'], default: [ 'id', 'user', 'asset', 'account', 'remote_addr', 'protocol', 'login_from', - 'command_amount', 'date_start', 'duration', 'terminal_display', 'actions' + 'command_amount', 'date_start', 'duration', 'terminal_display', 'actions', + 'is_locked' ] }, columnsMeta: { diff --git a/src/views/sessions/SessionList/OnlineList.vue b/src/views/sessions/SessionList/OnlineList.vue index ccb4ce7ce..87a86897b 100644 --- a/src/views/sessions/SessionList/OnlineList.vue +++ b/src/views/sessions/SessionList/OnlineList.vue @@ -4,7 +4,7 @@