|
@@ -141,7 +141,7 @@ func (t *wafTask) setCdnWebsitesState(ctx context.Context, ids []int, enable boo
|
|
|
defer wg.Done()
|
|
|
// cdn.EditWebIsOn 的第二个参数 isBan, false=启用, true=禁用
|
|
|
// 所以 enable=true 对应 isBan=false
|
|
|
- if err := t.cdn.EditWebIsOn(ctx, int64(id), !enable); err != nil {
|
|
|
+ if err := t.cdn.EditWebIsOn(ctx, int64(id), enable); err != nil {
|
|
|
errChan <- err
|
|
|
}
|
|
|
}(id)
|
|
@@ -521,29 +521,33 @@ func (t *wafTask) executeSinglePlanCleanup(ctx context.Context, limit model.Glob
|
|
|
if err != nil {
|
|
|
allErrors = multierror.Append(allErrors, err)
|
|
|
} else if len(tcpIds) > 0 {
|
|
|
- if err := t.tcp.DeleteTcpForwarding(ctx, v1.DeleteTcpForwardingRequest{Ids: tcpIds, HostId: limit.HostId}); err != nil {
|
|
|
+ if err := t.tcp.DeleteTcpForwarding(ctx, v1.DeleteTcpForwardingRequest{Ids: tcpIds, HostId: limit.HostId,Uid: limit.Uid}); err != nil {
|
|
|
allErrors = multierror.Append(allErrors, err)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
udpIds, err := t.udpForWardingRep.GetUdpForwardingWafUdpAllIds(ctx, limit.HostId)
|
|
|
if err != nil {
|
|
|
allErrors = multierror.Append(allErrors, err)
|
|
|
} else if len(udpIds) > 0 {
|
|
|
- if err := t.udp.DeleteUdpForwarding(ctx, v1.DeleteUdpForwardingRequest{Ids: udpIds, HostId: limit.HostId}); err != nil {
|
|
|
+ if err := t.udp.DeleteUdpForwarding(ctx, v1.DeleteUdpForwardingRequest{Ids: udpIds, HostId: limit.HostId,Uid: limit.Uid}); err != nil {
|
|
|
allErrors = multierror.Append(allErrors, err)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
webIds, err := t.webForWardingRep.GetWebForwardingWafWebAllIds(ctx, limit.HostId)
|
|
|
if err != nil {
|
|
|
allErrors = multierror.Append(allErrors, err)
|
|
|
} else if len(webIds) > 0 {
|
|
|
- if err := t.web.DeleteWebForwarding(ctx, v1.DeleteWebForwardingRequest{Ids: webIds, HostId: limit.HostId}); err != nil {
|
|
|
+ if err := t.web.DeleteWebForwarding(ctx, v1.DeleteWebForwardingRequest{Ids: webIds, HostId: limit.HostId,Uid: limit.Uid}); err != nil {
|
|
|
allErrors = multierror.Append(allErrors, err)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
// 只有在上述所有步骤都没有出错的情况下,才执行最终的数据库更新和Redis标记
|
|
|
if allErrors.ErrorOrNil() == nil {
|
|
|
err := t.gatewayIpRep.CleanIPByHostId(ctx, []int64{hostId})
|
|
@@ -557,6 +561,7 @@ func (t *wafTask) executeSinglePlanCleanup(ctx context.Context, limit model.Glob
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
return allErrors.ErrorOrNil()
|
|
|
}
|
|
|
|