TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-23 23:10:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

删除WAF策略和删除服务时同时也删除关联的IP名单

Browse Source
This commit is contained in:
GoEdgeLab
2021-11-16 17:50:52 +08:00
parent 770884eaca
commit dfb4e6a155
5 changed files with 140 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/rpc/services/service_ip_list.go
View File

@@ -97,12 +97,12 @@ func (this *IPListService) ListEnabledIPLists(ctx context.Context, req *pb.ListE
}
var tx = this.NullTx()
lists, err := models.SharedIPListDAO.ListEnabledIPLists(tx, req.Type, req.IsPublic, req.Keyword, req.Offset, req.Size)
ipLists, err := models.SharedIPListDAO.ListEnabledIPLists(tx, req.Type, req.IsPublic, req.Keyword, req.Offset, req.Size)
if err != nil {
return nil, err
}
var pbLists []*pb.IPList
for _, list := range lists {
for _, list := range ipLists {
pbLists = append(pbLists, &pb.IPList{
Id: int64(list.Id),
IsOn: list.IsOn == 1,
@@ -129,6 +129,13 @@ func (this *IPListService) DeleteIPList(ctx context.Context, req *pb.DeleteIPLis
if err != nil {
return nil, err
}
// 删除所有IP
err = models.SharedIPItemDAO.DisableIPItemsWithListId(tx, req.IpListId)
if err != nil {
return nil, err
}
return this.Success()
}