Ver Fonte

refactor(tcpForwarding): 重构 TcpForwardingRequest 结构体- 移除了 TcpForwardingRequest 中的冗余字段 Id
- 更新了 EditTcpForwarding 方法中相关代码,使用 TcpForwardingData.Id 替代原 req.Id

fusu há 1 mês atrás
pai
commit
ceacd1e763
2 ficheiros alterados com 3 adições e 5 exclusões
  1. 0 1
      api/v1/tcpForwarding.go
  2. 3 4
      internal/service/tcpforwarding.go

+ 0 - 1
api/v1/tcpForwarding.go

@@ -45,7 +45,6 @@ type DeleteTcpForwardingRequest struct {
 }
 
 type TcpForwardingRequest 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"`
 	TcpForwardingData TcpForwardingDataRequest `form:"data" json:"data"`

+ 3 - 4
internal/service/tcpforwarding.go

@@ -234,7 +234,7 @@ func (s *tcpforwardingService) AddTcpForwarding(ctx context.Context, req *v1.Tcp
 }
 
 func (s *tcpforwardingService) EditTcpForwarding(ctx context.Context, req *v1.TcpForwardingRequest) error {
-	WafTcpId, err := s.tcpforwardingRepository.GetTcpforwardingWafTcpIdById(ctx, req.Id)
+	WafTcpId, err := s.tcpforwardingRepository.GetTcpforwardingWafTcpIdById(ctx, req.TcpForwardingData.Id)
 	if err != nil {
 		return  err
 	}
@@ -243,17 +243,16 @@ func (s *tcpforwardingService) EditTcpForwarding(ctx context.Context, req *v1.Tc
 	if err != nil {
 		return  err
 	}
-
 	_, err = s.wafformatter.sendFormData(ctx, "admin/info/waf_tcp/edit?&__goadmin_edit_pk="+strconv.Itoa(req.TcpForwardingData.WafTcpId), "admin/edit/waf_tcp", formData)
 	if err != nil {
 		return err
 	}
 	tcpModel := s.buildTcpForwardingModel(&req.TcpForwardingData, req.TcpForwardingData.WafTcpId, require)
-	tcpModel.Id = req.Id
+	tcpModel.Id = req.TcpForwardingData.Id
 	if err = s.tcpforwardingRepository.EditTcpforwarding(ctx, tcpModel); err != nil {
 		return  err
 	}
-	TcpRuleModel := s.buildTcpRuleModel(&req.TcpForwardingData, require, req.Id)
+	TcpRuleModel := s.buildTcpRuleModel(&req.TcpForwardingData, require, req.TcpForwardingData.Id)
 	if err = s.tcpforwardingRepository.EditTcpforwardingIps(ctx, *TcpRuleModel); err != nil {
 		return err
 	}