From dd5b805da99cf031bd0b043aa2a1ea6962b51468 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Tue, 19 Apr 2022 16:01:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=20KoKo=20SSH=20Client=20=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en.json | 2 ++ src/i18n/langs/ja.json | 6 ++++-- src/i18n/langs/zh.json | 6 ++++-- src/views/settings/Terminal/Base.vue | 8 ++++++++ src/views/users/Role/RoleDetail/RoleInfo.vue | 1 + 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 055b4547c..fa2706595 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -897,6 +897,8 @@ } }, "setting": { + "EnableKoKoSSHHelpText": "Enabled, connect assets to display SSH Client pull-up method", + "SettingInEndpointHelpText": "Configure the service address and port in System Settings / Terminal Settings / Service Endpoints", "Feature": "Feature", "SMSProvider": "SMS provider", "SMS": "SMS", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index 36b86400a..9fad8a9f4 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -918,6 +918,8 @@ } }, "setting": { + "EnableKoKoSSHHelpText": "有効にすると、アセットを接続してSSHクライアントのプルアップ方式を表示します", + "SettingInEndpointHelpText": "[システム設定]/[端末設定]/[サービスエンドポイント]でサービスアドレスとポートを構成します", "Feature": "機能", "AlibabaCloud": "Alibaba cloud", "TencentCloud": "テンセント雲", @@ -1490,8 +1492,8 @@ "InterfaceSettings": "インターフェース設定", "License": "ライセンス", "ComponentMonitor": "コンポーネントモニタリング", - "Endpoint": "ターミナルエンドポイント", - "EndpointRule": "エンドポイントエンドポイントルール", + "Endpoint": "エンドポイント", + "EndpointRule": "エンドポイントルール", "ServiceRatio": "コンポーネント負荷統計", "LoadStatus": "コンポーネントステータス", "NormalLoad": "正常", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index b5711b187..96b3630de 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -919,6 +919,8 @@ } }, "setting": { + "EnableKoKoSSHHelpText": "开启时连接资产会显示 SSH Client 拉起方式", + "SettingInEndpointHelpText": "在 系统设置 / 终端设置 / 服务端点 中配置服务地址和端口", "Feature": "功能", "AlibabaCloud": "阿里云", "TencentCloud": "腾讯云", @@ -1491,8 +1493,8 @@ "InterfaceSettings": "界面设置", "License": "许可证", "ComponentMonitor": "组件监控", - "Endpoint": "终端节点", - "EndpointRule": "终端节点规则", + "Endpoint": "服务端点", + "EndpointRule": "端点规则", "ServiceRatio": "组件负载统计", "LoadStatus":"组件状态", "NormalLoad":"正常", diff --git a/src/views/settings/Terminal/Base.vue b/src/views/settings/Terminal/Base.vue index 02664cf36..3f36404d9 100644 --- a/src/views/settings/Terminal/Base.vue +++ b/src/views/settings/Terminal/Base.vue @@ -20,6 +20,7 @@ export default { [ `SSH ${comp}(KoKo)`, [ + 'TERMINAL_KOKO_SSH_ENABLED', 'TERMINAL_PASSWORD_AUTH', 'TERMINAL_PUBLIC_KEY_AUTH', 'TERMINAL_ASSET_LIST_SORT_BY', 'TERMINAL_ASSET_LIST_PAGE_SIZE', 'TERMINAL_TELNET_REGEX' @@ -39,16 +40,23 @@ export default { ] ], fieldsMeta: { + TERMINAL_KOKO_SSH_ENABLED: { + helpText: this.$i18n.t('common.Info') + ': ' + this.$i18n.t('setting.EnableKoKoSSHHelpText') + }, TERMINAL_TELNET_REGEX: { type: 'input' }, XRDP_ENABLED: { + helpText: this.$i18n.t('common.Info') + ': ' + this.$i18n.t('setting.SettingInEndpointHelpText'), hidden: () => { return !this.$store.getters.hasValidLicense }, el: { hiddenGroup: true } + }, + TERMINAL_MAGNUS_ENABLED: { + helpText: this.$i18n.t('common.Info') + ': ' + this.$i18n.t('setting.SettingInEndpointHelpText') } }, getUrl: () => '/api/v1/settings/setting/?category=terminal', diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue index b9d7838d3..629790e38 100644 --- a/src/views/users/Role/RoleDetail/RoleInfo.vue +++ b/src/views/users/Role/RoleDetail/RoleInfo.vue @@ -100,6 +100,7 @@ export default { 'assets.gateway': ['assets.view_domain'], 'assets.view_authbook': ['assets.view_node'], 'assets.gathereduser': ['assets.view_node'], + 'assets.refresh_assethardwareinfo': ['assets.change_asset'], 'xpack.gatherusertaskexecution': ['xpack.view_gatherusertask'], 'applications.add_application': ['assets.view_asset'], 'applications.view_account': ['applications.view_application'],