From 34ac685e65dba55d38e245f18a163fa1c9614aa5 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Tue, 30 May 2023 15:46:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9D=A2=E6=9D=BF=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E8=BE=93=E5=85=A5=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E5=8F=8A?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=20(#1193)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/lang/modules/en.ts | 5 +++--
frontend/src/lang/modules/zh.ts | 2 +-
frontend/src/views/host/ssh/log/log.vue | 8 ++++----
frontend/src/views/setting/panel/ntp/index.vue | 2 +-
frontend/src/views/setting/safe/allowips/index.vue | 3 ++-
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 0e643ed1c..a8832bc72 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -1000,9 +1000,10 @@ const message = {
allowIPsHelper:
'After setting the authorized IP address, only the IP address in the setting can access the 1Panel service',
allowIPsWarnning:
- '设After setting the authorized IP address, only the IP address in the setting can access the 1Panel service. Do you want to continue?',
+ 'After setting the authorized IP address, only the IP address in the setting can access the 1Panel service. Do you want to continue?',
allowIPsHelper1: 'If the authorized IP address is empty, the authorized IP address is canceled',
- allowIPEgs: 'e.g. 172.16.10.111',
+ allowIPEgs:
+ 'If multiple ip authorizations exist, newlines need to be displayed. For example, \n172.16.10.111 \n172.16.10.111',
mfa: 'MFA',
mfaAlert:
'MFA password is generated based on the current time. Please ensure that the server time is synchronized.',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 19c02c899..6034637a8 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -1016,7 +1016,7 @@ const message = {
allowIPsHelper: '设置授权 IP 后，仅有设置中的 IP 可以访问 1Panel 服务',
allowIPsWarnning: '设置授权 IP 后，仅有设置中的 IP 可以访问 1Panel 服务，是否继续？',
allowIPsHelper1: '授权 IP 为空时，则取消授权 IP',
- allowIPEgs: '例：172.16.10.111',
+ allowIPEgs: '当存在多个授权 IP 时，需要换行显示，例： \n172.16.10.111 \n172.16.10.111',
mfa: '两步验证',
mfaAlert: '两步验证密码是基于当前时间生成，请确保服务器时间已同步',
mfaHelper: '开启后会验证手机应用验证码',
diff --git a/frontend/src/views/host/ssh/log/log.vue b/frontend/src/views/host/ssh/log/log.vue
index 797d41be7..9cc6e881c 100644
--- a/frontend/src/views/host/ssh/log/log.vue
+++ b/frontend/src/views/host/ssh/log/log.vue
@@ -10,12 +10,12 @@
-
+
{{ $t('commons.status.success') }}： {{ successfulCount }}
-
-
+
+
{{ $t('commons.status.failed') }}： {{ faliedCount }}
-
+
diff --git a/frontend/src/views/setting/panel/ntp/index.vue b/frontend/src/views/setting/panel/ntp/index.vue
index e1a1099c4..2ce4ca183 100644
--- a/frontend/src/views/setting/panel/ntp/index.vue
+++ b/frontend/src/views/setting/panel/ntp/index.vue
@@ -7,7 +7,7 @@
-
+
{{ $t('website.default') }}
diff --git a/frontend/src/views/setting/safe/allowips/index.vue b/frontend/src/views/setting/safe/allowips/index.vue
index 596978487..1f52e66c7 100644
--- a/frontend/src/views/setting/safe/allowips/index.vue
+++ b/frontend/src/views/setting/safe/allowips/index.vue
@@ -14,6 +14,7 @@
:autosize="{ minRows: 8, maxRows: 10 }"
v-model="allowIPs"
/>
+ {{ $t('setting.allowIPsHelper1') }}
@@ -57,7 +58,7 @@ const onSavePort = async () => {
let ips = allowIPs.value.split('\n');
for (const ip of ips) {
if (ip) {
- if (checkIp(ip)) {
+ if (checkIp(ip) || ip === '0.0.0.0') {
MsgError(i18n.global.t('firewall.addressFormatError'));
return false;
}