From 055216604ecf5c2f19424c1dc29b5db8879e4176 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:26:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8F=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=20(#3003)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/modules/en.ts | 6 +- frontend/src/lang/modules/tw.ts | 5 +- frontend/src/lang/modules/zh.ts | 5 +- .../container/container/operate/index.vue | 69 +++++++++---------- .../src/views/host/ssh/log/analysis/index.vue | 12 ++-- frontend/src/views/host/ssh/log/log.vue | 22 +----- .../src/views/toolbox/device/hosts/index.vue | 53 +++++++------- 7 files changed, 74 insertions(+), 98 deletions(-) diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 602a74af2..9244cf870 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -593,8 +593,8 @@ const message = { forcePull: 'forced image pull ', forcePullHelper: 'Ignore existing images on the server and pull again.', server: 'Host', - serverExample: 'e.g. 80, 80-88, ip:80 or ip:80-88', - containerExample: 'e.g. 80 or 80-88', + serverExample: '80, 80-88, ip:80 or ip:80-88', + containerExample: '80 or 80-88', exposePort: 'Expose port', exposeAll: 'Expose all', cmdHelper: "e.g. 'nginx' '-g' 'daemon off;' OR nginx -g daemon off;", @@ -1054,6 +1054,8 @@ const message = { disable: 'Disable Autostart', sshAlert: 'The list data is sorted based on login time, but please note that changing time zones or other operations may cause deviations in the time of login logs.', + sshAlert2: + 'You can use Fail2ban in the toolbox to block IP addresses attempting brute force attacks, thus enhancing the security of the host.', sshOperate: 'Operation [{0}] on the SSH service is performed. Do you want to continue?', sshChange: 'SSH Setting', sshChangeHelper: 'This action changed {0} to [{1}]. Do you want to continue?', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index feea8e23e..a7aa7fa6e 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -574,8 +574,8 @@ const message = { forcePull: '強製拉取鏡像', forcePullHelper: '忽略服務器已存在的鏡像，重新拉取一次', server: '服務器', - serverExample: '例： 80, 80-88, ip:80 或者 ip:80-88', - containerExample: '例： 80 或者 80-88', + serverExample: '80, 80-88, ip:80 或者 ip:80-88', + containerExample: '80 或者 80-88', exposePort: '暴露端口', exposeAll: '暴露所有', cmdHelper: "例： 'nginx' '-g' 'daemon off;' 或 nginx -g daemon off;", @@ -1009,6 +1009,7 @@ const message = { enable: '設置開機自啟', disable: '關閉開機自啟', sshAlert: '列表數據根據登錄時間排序，但請註意，切換時區或其他操作可能導致登錄日誌的時間出現偏差。', + sshAlert2: '您可以通过工具箱中的 Fail2ban 屏蔽尝试暴力破解的 IP 地址，从而提高主机的安全性。', sshOperate: '對 SSH 服務進行 [{0}] 操作，是否繼續？', sshChange: 'SSH 配置修改', sshChangeHelper: '此操作將 {0} 修改為 [{1}] ，是否繼續？', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index db0c12c3f..e7de53f5c 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -575,8 +575,8 @@ const message = { forcePull: '强制拉取镜像', forcePullHelper: '忽略服务器已存在的镜像，重新拉取一次', server: '服务器', - serverExample: '例： 80, 80-88, ip:80 或者 ip:80-88', - containerExample: '例： 80 或者 80-88', + serverExample: '80, 80-88, ip:80 或者 ip:80-88', + containerExample: '80 或者 80-88', exposePort: '暴露端口', exposeAll: '暴露所有', cmdHelper: "例： 'nginx' '-g' 'daemon off;' 或者 nginx -g daemon off;", @@ -1010,6 +1010,7 @@ const message = { enable: '设置开机自启', disable: '关闭开机自启', sshAlert: '列表数据根据登录时间排序，但请注意，切换时区或其他操作可能导致登录日志的时间出现偏差。', + sshAlert2: '可通过工具箱中的 Fail2ban 屏蔽暴力破解 IP，从而保护主机安全。', sshOperate: '对 SSH 服务进行 [{0}] 操作，是否继续？', sshChange: 'SSH 配置修改', sshChangeHelper: '此操作将 {0} 修改为 [{1}] ，是否继续？', diff --git a/frontend/src/views/container/container/operate/index.vue b/frontend/src/views/container/container/operate/index.vue index 563144be0..1a5ebf90a 100644 --- a/frontend/src/views/container/container/operate/index.vue +++ b/frontend/src/views/container/container/operate/index.vue @@ -64,52 +64,47 @@ - - - - - - - - - -
- - - - - -
- - + + + + + + + + + + + + + + + + + {{ $t('commons.button.add') }} + diff --git a/frontend/src/views/host/ssh/log/analysis/index.vue b/frontend/src/views/host/ssh/log/analysis/index.vue index add7dd877..8b820857e 100644 --- a/frontend/src/views/host/ssh/log/analysis/index.vue +++ b/frontend/src/views/host/ssh/log/analysis/index.vue @@ -107,13 +107,11 @@
- - - - -
- {{ row }} -
+
    +
  • + {{ row }} +
    • +
diff --git a/frontend/src/views/host/ssh/log/log.vue b/frontend/src/views/host/ssh/log/log.vue index 0912884d5..ad2d4c86e 100644 --- a/frontend/src/views/host/ssh/log/log.vue +++ b/frontend/src/views/host/ssh/log/log.vue @@ -2,7 +2,8 @@
- -
@@ -83,7 +73,6 @@ import TableSetting from '@/components/table-setting/index.vue'; import { dateFormat } from '@/utils/util'; import { onMounted, reactive, ref } from '@vue/runtime-core'; import { loadSSHLogs } from '@/api/modules/host'; -import Analysis from '@/views/host/ssh/log/analysis/index.vue'; const loading = ref(); const data = ref(); @@ -95,11 +84,6 @@ const paginationConfig = reactive({ }); const searchInfo = ref(); const searchStatus = ref('All'); -const analysisRef = ref(); - -const onLoadAnalysis = () => { - analysisRef.value.acceptParams(); -}; const search = async () => { let params = { diff --git a/frontend/src/views/toolbox/device/hosts/index.vue b/frontend/src/views/toolbox/device/hosts/index.vue index 2825645fe..812d98f27 100644 --- a/frontend/src/views/toolbox/device/hosts/index.vue +++ b/frontend/src/views/toolbox/device/hosts/index.vue @@ -11,35 +11,30 @@ {{ $t('database.baseConf') }} {{ $t('database.allConf') }} - - - - - - - - - - - - - - -
- - - -
- - - - - - {{ $t('commons.button.delete') }} - -
- {{ $t('commons.button.add') }} -
+
+ + + + + + + + + + + + + {{ $t('commons.button.add') }} + +