TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-12-30 23:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复全局封锁名单不能创建IP的Bug/创建和修改IP可以直接选择过期时间

Browse Source
This commit is contained in:
GoEdgeLab
2022-07-14 10:19:45 +08:00
parent 35d8c2a6f3
commit c87c3ef5b6
15 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/web/actions/default/servers/iplists/createIPPopup.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/maps"
"github.com/iwind/TeaGo/types"
@@ -63,13 +64,15 @@ func (this *CreateIPPopupAction) RunPost(params struct {
CSRF *actionutils.CSRF
}) {
// 校验IPList
existsResp, err := this.RPC().IPListRPC().ExistsEnabledIPList(this.AdminContext(), &pb.ExistsEnabledIPListRequest{IpListId: params.ListId})
if err != nil {
this.ErrorPage(err)
return
}
if !existsResp.Exists {
this.Fail("IP名单不存在")
if params.ListId != firewallconfigs.GlobalListId {
existsResp, err := this.RPC().IPListRPC().ExistsEnabledIPList(this.AdminContext(), &pb.ExistsEnabledIPListRequest{IpListId: params.ListId})
if err != nil {
this.ErrorPage(err)
return
}
if !existsResp.Exists {
this.Fail("IP名单不存在")
}
}
type ipData struct {