gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-08 01:20:07 +08:00
Code

fix: 防火墙样式调整 (#515)

Browse Source
This commit is contained in:
ssongliu 2023-04-06 11:12:15 +08:00 committed by GitHub
parent 1a1a14719d
commit 363a67b0f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app/service/firewall.go
View File

@ -34,6 +34,9 @@ func (u *FirewallService) LoadBaseInfo() (dto.FirewallBaseInfo, error) {
var baseInfo dto.FirewallBaseInfo var baseInfo dto.FirewallBaseInfo
client, err := firewall.NewFirewallClient() client, err := firewall.NewFirewallClient()
if err != nil { if err != nil {
if err.Error() == "no such type" {
return dto.FirewallBaseInfo{Name: "-", Version: "-", Status: "not running", PingStatus: "Disable"}, nil
}
return baseInfo, err return baseInfo, err
} }
baseInfo.Name = client.Name() baseInfo.Name = client.Name()
@ -294,7 +297,6 @@ func (u *FirewallService) BacthOperateRule(req dto.BatchRuleOperate) error {
} }
func OperateFirewallPort(oldPorts, newPorts []int) error { func OperateFirewallPort(oldPorts, newPorts []int) error {
fmt.Printf("old: %v, new: %v \n", oldPorts, newPorts)
client, err := firewall.NewFirewallClient() client, err := firewall.NewFirewallClient()
if err != nil { if err != nil {
return err return err

20
frontend/src/routers/modules/host.ts
View File

@ -29,6 +29,16 @@ const hostRouter = {
requiresAuth: false, 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', path: '/hosts/firewall/port',
name: 'FirewallPort', name: 'FirewallPort',
@ -48,16 +58,6 @@ const hostRouter = {
requiresAuth: false, requiresAuth: false,
}, },
}, },
{
path: '/hosts/terminal',
name: 'Terminal',
component: () => import('@/views/host/terminal/index.vue'),
meta: {
title: 'menu.terminal',
keepAlive: true,
requiresAuth: false,
},
},
], ],
}; };

4
frontend/src/views/host/firewall/ip/operate/index.vue
View File

@ -21,8 +21,8 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('firewall.strategy')" prop="strategy"> <el-form-item :label="$t('firewall.strategy')" prop="strategy">
<el-radio-group v-model="dialogData.rowData!.strategy"> <el-radio-group v-model="dialogData.rowData!.strategy">
<el-radio label="accept">{{ $t('firewall.accept') }}</el-radio> <el-radio label="accept">{{ $t('firewall.allow') }}</el-radio>
<el-radio label="drop">{{ $t('firewall.drop') }}</el-radio> <el-radio label="drop">{{ $t('firewall.deny') }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>

2
frontend/src/views/host/firewall/status/index.vue
View File

@ -3,7 +3,7 @@
<div class="app-status" style="margin-top: 20px"> <div class="app-status" style="margin-top: 20px">
<el-card> <el-card>
<div> <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"> <el-tag round class="status-content" v-if="baseInfo.status === 'running'" type="success">
{{ $t('commons.status.running') }} {{ $t('commons.status.running') }}
</el-tag> </el-tag>