TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-25 22:46:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加通过IP删除IP名单中IP参数

Browse Source
This commit is contained in:
GoEdgeLab
2022-05-10 15:11:48 +08:00
parent 3d0ddeb129
commit 7c32617d08
3 changed files with 111 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
internal/rpc/services/service_ip_item.go
View File

@@ -114,23 +114,42 @@ func (this *IPItemService) DeleteIPItem(ctx context.Context, req *pb.DeleteIPIte
return nil, err
}
tx := this.NullTx()
var tx = this.NullTx()
if userId > 0 {
listId, err := models.SharedIPItemDAO.FindItemListId(tx, req.IpItemId)
if err != nil {
return nil, err
// 如果是使用IPItemId删除
if req.IpItemId > 0 {
if userId > 0 {
listId, err := models.SharedIPItemDAO.FindItemListId(tx, req.IpItemId)
if err != nil {
return nil, err
}
err = models.SharedIPListDAO.CheckUserIPList(tx, userId, listId)
if err != nil {
return nil, err
}
}
err = models.SharedIPListDAO.CheckUserIPList(tx, userId, listId)
err = models.SharedIPItemDAO.DisableIPItem(tx, req.IpItemId)
if err != nil {
return nil, err
}
}
err = models.SharedIPItemDAO.DisableIPItem(tx, req.IpItemId)
if err != nil {
return nil, err
// 如果是使用ipFrom+ipTo删除
if len(req.IpFrom) > 0 {
// 检查IP列表
if req.IpListId > 0 && userId > 0 {
err = models.SharedIPListDAO.CheckUserIPList(tx, userId, req.IpListId)
if err != nil {
return nil, err
}
}
err = models.SharedIPItemDAO.DisableIPItemsWithIP(tx, req.IpFrom, req.IpTo, userId, req.IpListId)
if err != nil {
return nil, err
}
}
return this.Success()