From 363a67b0f243db0d43cabd62752691f2d06a9317 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Thu, 6 Apr 2023 11:12:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=98=B2=E7=81=AB=E5=A2=99=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=20(#515)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/firewall.go               |  4 +++-
 frontend/src/routers/modules/host.ts          | 20 +++++++++----------
 .../views/host/firewall/ip/operate/index.vue  |  4 ++--
 .../src/views/host/firewall/status/index.vue  |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/backend/app/service/firewall.go b/backend/app/service/firewall.go
index 09a099426..fe4797364 100644
--- a/backend/app/service/firewall.go
+++ b/backend/app/service/firewall.go
@@ -34,6 +34,9 @@ func (u *FirewallService) LoadBaseInfo() (dto.FirewallBaseInfo, error) {
 	var baseInfo dto.FirewallBaseInfo
 	client, err := firewall.NewFirewallClient()
 	if err != nil {
+		if err.Error() == "no such type" {
+			return dto.FirewallBaseInfo{Name: "-", Version: "-", Status: "not running", PingStatus: "Disable"}, nil
+		}
 		return baseInfo, err
 	}
 	baseInfo.Name = client.Name()
@@ -294,7 +297,6 @@ func (u *FirewallService) BacthOperateRule(req dto.BatchRuleOperate) error {
 }
 
 func OperateFirewallPort(oldPorts, newPorts []int) error {
-	fmt.Printf("old: %v, new: %v \n", oldPorts, newPorts)
 	client, err := firewall.NewFirewallClient()
 	if err != nil {
 		return err
diff --git a/frontend/src/routers/modules/host.ts b/frontend/src/routers/modules/host.ts
index 022217cbd..16d2386f0 100644
--- a/frontend/src/routers/modules/host.ts
+++ b/frontend/src/routers/modules/host.ts
@@ -29,6 +29,16 @@ const hostRouter = {
                 requiresAuth: false,
             },
         },
+        {
+            path: '/hosts/terminal',
+            name: 'Terminal',
+            component: () => import('@/views/host/terminal/index.vue'),
+            meta: {
+                title: 'menu.terminal',
+                keepAlive: true,
+                requiresAuth: false,
+            },
+        },
         {
             path: '/hosts/firewall/port',
             name: 'FirewallPort',
@@ -48,16 +58,6 @@ const hostRouter = {
                 requiresAuth: false,
             },
         },
-        {
-            path: '/hosts/terminal',
-            name: 'Terminal',
-            component: () => import('@/views/host/terminal/index.vue'),
-            meta: {
-                title: 'menu.terminal',
-                keepAlive: true,
-                requiresAuth: false,
-            },
-        },
     ],
 };
 
diff --git a/frontend/src/views/host/firewall/ip/operate/index.vue b/frontend/src/views/host/firewall/ip/operate/index.vue
index ebc0a539d..91b27dbfd 100644
--- a/frontend/src/views/host/firewall/ip/operate/index.vue
+++ b/frontend/src/views/host/firewall/ip/operate/index.vue
@@ -21,8 +21,8 @@
                         </el-form-item>
                         <el-form-item :label="$t('firewall.strategy')" prop="strategy">
                             <el-radio-group v-model="dialogData.rowData!.strategy">
-                                <el-radio label="accept">{{ $t('firewall.accept') }}</el-radio>
-                                <el-radio label="drop">{{ $t('firewall.drop') }}</el-radio>
+                                <el-radio label="accept">{{ $t('firewall.allow') }}</el-radio>
+                                <el-radio label="drop">{{ $t('firewall.deny') }}</el-radio>
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
diff --git a/frontend/src/views/host/firewall/status/index.vue b/frontend/src/views/host/firewall/status/index.vue
index ac2e2edce..1101b6cbc 100644
--- a/frontend/src/views/host/firewall/status/index.vue
+++ b/frontend/src/views/host/firewall/status/index.vue
@@ -3,7 +3,7 @@
         <div class="app-status" style="margin-top: 20px">
             <el-card>
                 <div>
-                    <el-tag style="float: left" effect="dark" type="success">{{ baseInfo.name }}</el-tag>
+                    <el-tag effect="dark" type="success">{{ baseInfo.name }}</el-tag>
                     <el-tag round class="status-content" v-if="baseInfo.status === 'running'" type="success">
                         {{ $t('commons.status.running') }}
                     </el-tag>