Parcourir la source

refactor(udp & web forwarding): 调整请求结构并移除未使用的 ID 字段

- 在 UdpForwardingRequest 和 WebForwardingRequest 结构中移除了未使用的 ID 字段
-将 UdpForwardingData 和 WebForwardingData 字段标记为 `form:"data" json:"data"`- 更新了相关服务中的方法,使用 UdpForwardingData 和 WebForwardingData 中的 ID
fusu il y a 1 mois
Parent
commit
40c2eb42f6

+ 1 - 2
api/v1/udpForwarding.go

@@ -49,8 +49,7 @@ type DeleteUdpForwardingRequest struct {
 type UdpForwardingRequest struct {
 	HostId            int `form:"host_id" json:"host_id" binding:"required"`
 	Uid               int `form:"uid" json:"uid" binding:"required"`
-	Id                int `form:"id" json:"id"`
-	UdpForwardingData UdpForwardingDataRequest
+	UdpForwardingData UdpForwardingDataRequest `form:"data" json:"data"`
 }
 
 type UdpForwardingRequire struct {

+ 0 - 1
api/v1/webForwarding.go

@@ -63,7 +63,6 @@ type DeleteWebForwardingRequest struct {
 }
 
 type WebForwardingRequest struct {
-	Id                 int    `form:"id" json:"id"`
 	HostId            int `form:"host_id" json:"host_id" binding:"required"`
 	Uid               int `form:"uid" json:"uid" binding:"required"`
 	WebForwardingData WebForwardingDataRequest `form:"data" json:"data"`

+ 3 - 3
internal/service/udpforwarding.go

@@ -245,7 +245,7 @@ func (s *udpForWardingService) AddUdpForwarding(ctx context.Context, req *v1.Udp
 }
 
 func (s *udpForWardingService) EditUdpForwarding(ctx context.Context, req *v1.UdpForwardingRequest) error {
-	WafUdpId, err := s.udpForWardingRepository.GetUdpForwardingWafUdpIdById(ctx, req.Id)
+	WafUdpId, err := s.udpForWardingRepository.GetUdpForwardingWafUdpIdById(ctx, req.UdpForwardingData.Id)
 	if err != nil {
 		return err
 	}
@@ -259,11 +259,11 @@ func (s *udpForWardingService) EditUdpForwarding(ctx context.Context, req *v1.Ud
 		return err
 	}
 	udpModel := s.buildUdpForwardingModel(&req.UdpForwardingData, req.UdpForwardingData.WafUdpId, require)
-	udpModel.Id = req.Id
+	udpModel.Id = req.UdpForwardingData.Id
 	if err = s.udpForWardingRepository.EditUdpForwarding(ctx, udpModel); err != nil {
 		return err
 	}
-	udpRuleModel := s.buildUdpRuleModel(&req.UdpForwardingData, require, req.Id)
+	udpRuleModel := s.buildUdpRuleModel(&req.UdpForwardingData, require, req.UdpForwardingData.Id)
 	if err = s.udpForWardingRepository.EditUdpForwardingIps(ctx, *udpRuleModel); err != nil {
 		return err
 	}

+ 3 - 3
internal/service/webforwarding.go

@@ -305,7 +305,7 @@ func (s *webForwardingService) AddWebForwarding(ctx context.Context, req *v1.Web
 }
 
 func (s *webForwardingService) EditWebForwarding(ctx context.Context, req *v1.WebForwardingRequest) error {
-	WafWebId, err := s.webForwardingRepository.GetWebForwardingWafWebIdById(ctx, req.Id)
+	WafWebId, err := s.webForwardingRepository.GetWebForwardingWafWebIdById(ctx, req.WebForwardingData.Id)
 	if err != nil {
 		return err
 	}
@@ -320,11 +320,11 @@ func (s *webForwardingService) EditWebForwarding(ctx context.Context, req *v1.We
 		return err
 	}
 	webModel := s.buildWebForwardingModel(&req.WebForwardingData, req.WebForwardingData.WafWebId, require)
-	webModel.Id = req.Id
+	webModel.Id = req.WebForwardingData.Id
 	if err = s.webForwardingRepository.EditWebForwarding(ctx, webModel); err != nil {
 		return err
 	}
-	webRuleModel := s.buildWebRuleModel(&req.WebForwardingData, require, req.Id)
+	webRuleModel := s.buildWebRuleModel(&req.WebForwardingData, require, req.WebForwardingData.Id)
 	if err = s.webForwardingRepository.EditWebForwardingIps(ctx, *webRuleModel); err != nil {
 		return err
 	}