From 4a4c2b24dddf86044c289bbd74ebae102fb5044d Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Mon, 10 Apr 2023 12:58:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=A6=81=20ping=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#557)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/utils/firewall/client/firewalld.go        | 2 +-
 frontend/src/views/host/firewall/status/index.vue | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/utils/firewall/client/firewalld.go b/backend/utils/firewall/client/firewalld.go
index 680624c24..d36d3c9eb 100644
--- a/backend/utils/firewall/client/firewalld.go
+++ b/backend/utils/firewall/client/firewalld.go
@@ -43,7 +43,7 @@ func (f *Firewall) Start() error {
 }
 
 func (f *Firewall) PingStatus() (string, error) {
-	stdout, _ := cmd.Exec("firewall-cmd --query-rich-rule='rule protocol value=icmp drop'")
+	stdout, _ := cmd.Exec("firewall-cmd --zone=public  --query-rich-rule='rule protocol value=icmp drop'")
 	if stdout == "yes\n" {
 		return constant.StatusEnable, nil
 	}
diff --git a/frontend/src/views/host/firewall/status/index.vue b/frontend/src/views/host/firewall/status/index.vue
index 9b39f6977..49a25bb0e 100644
--- a/frontend/src/views/host/firewall/status/index.vue
+++ b/frontend/src/views/host/firewall/status/index.vue
@@ -47,6 +47,7 @@ import { ref } from 'vue';
 
 const baseInfo = ref<Host.FirewallBase>({ status: '', name: '', version: '', pingStatus: '' });
 const onPing = ref('Disable');
+const oldStatus = ref();
 
 const acceptParams = (): void => {
     loadBaseInfo(true);
@@ -58,6 +59,7 @@ const loadBaseInfo = async (search: boolean) => {
         .then((res) => {
             baseInfo.value = res.data;
             onPing.value = baseInfo.value.pingStatus;
+            oldStatus.value = onPing.value;
             emit('update:name', baseInfo.value.name);
             emit('update:status', baseInfo.value.status);
             if (search) {
@@ -118,8 +120,7 @@ const onPingOperate = async (operation: string) => {
                 });
         })
         .catch(() => {
-            emit('update:loading', true);
-            loadBaseInfo(false);
+            onPing.value = oldStatus.value;
         });
 };