|
@@ -44,7 +44,7 @@ type AidedWebService interface {
|
|
|
|
|
|
// 数据库操作
|
|
|
SaveToDatabase(ctx context.Context, req *v1.WebForwardingRequest, require RequireResponse, webId int64, cdnOriginIds map[string]int64) (int, error)
|
|
|
- UpdateDatabaseRecords(ctx context.Context, req *v1.WebForwardingRequest, oldData *model.WebForwarding, require RequireResponse, ipData *model.WebForwardingRule) error
|
|
|
+ UpdateDatabaseRecords(ctx context.Context, req *v1.WebForwardingRequest, require RequireResponse, ipData *model.WebForwardingRule) error
|
|
|
CleanupDatabaseRecords(ctx context.Context, id int) error
|
|
|
|
|
|
// SSL证书管理
|
|
@@ -386,7 +386,7 @@ func (s *aidedWebService) WashDifferentIp(newIpList []string, oldIpList []string
|
|
|
newAllowIps = append(newAllowIps, v)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
addedDenyIps, removedDenyIps = s.wafformatter.findIpDifferences(oldAllowIps, newAllowIps)
|
|
|
return addedDenyIps, removedDenyIps
|
|
|
}
|
|
@@ -1027,7 +1027,7 @@ func (s *aidedWebService) SaveToDatabase(ctx context.Context, req *v1.WebForward
|
|
|
}
|
|
|
|
|
|
// UpdateDatabaseRecords 更新数据库记录
|
|
|
-func (s *aidedWebService) UpdateDatabaseRecords(ctx context.Context, req *v1.WebForwardingRequest, oldData *model.WebForwarding, require RequireResponse, ipData *model.WebForwardingRule) error {
|
|
|
+func (s *aidedWebService) UpdateDatabaseRecords(ctx context.Context, req *v1.WebForwardingRequest, require RequireResponse, ipData *model.WebForwardingRule) error {
|
|
|
webModel := s.BuildWebForwardingModel(&req.WebForwardingData, req.WebForwardingData.CdnWebId, require)
|
|
|
webModel.Id = req.WebForwardingData.Id
|
|
|
|