diff --git a/src/modules/trace/controller/tcpdump.go b/src/modules/trace/controller/tcpdump.go index a94039d6..6924de56 100644 --- a/src/modules/trace/controller/tcpdump.go +++ b/src/modules/trace/controller/tcpdump.go @@ -6,9 +6,11 @@ import ( "ems.agt/src/framework/cmd" "ems.agt/src/framework/config" + "ems.agt/src/framework/i18n" + "ems.agt/src/framework/utils/ctx" "ems.agt/src/framework/utils/ssh" "ems.agt/src/framework/vo/result" - netElementService "ems.agt/src/modules/net_element/service" + netElementService "ems.agt/src/modules/network_element/service" traceService "ems.agt/src/modules/trace/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" @@ -34,6 +36,7 @@ type TcpdumpController struct { // // POST /ne func (s *TcpdumpController) NeTask(c *gin.Context) { + language := ctx.AcceptLanguage(c) var body struct { NeType string `json:"neType" binding:"required"` // 网元类型 NeId string `json:"neId" binding:"required"` // 网元ID @@ -43,7 +46,7 @@ func (s *TcpdumpController) NeTask(c *gin.Context) { } err := c.ShouldBindBodyWith(&body, binding.JSON) if err != nil { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } @@ -51,7 +54,7 @@ func (s *TcpdumpController) NeTask(c *gin.Context) { neInfo := s.NeInfoService.SelectNeInfoByNeTypeAndNeID(body.NeType, body.NeId) if neInfo.NeId != body.NeId { // 找不到 %s %s 对应网元信息 - msg := fmt.Sprintf("Cannot find %s %s network element information.", body.NeType, body.NeId) + msg := i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId}) c.JSON(200, result.ErrMsg(msg)) return } @@ -79,6 +82,7 @@ func (s *TcpdumpController) NeTask(c *gin.Context) { // // POST /download func (s *TcpdumpController) Download(c *gin.Context) { + language := ctx.AcceptLanguage(c) var body struct { NeType string `json:"neType" binding:"required"` // 网元类型 NeId string `json:"neId" binding:"required"` // 网元ID @@ -86,7 +90,7 @@ func (s *TcpdumpController) Download(c *gin.Context) { } err := c.ShouldBindBodyWith(&body, binding.JSON) if err != nil { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } @@ -94,7 +98,7 @@ func (s *TcpdumpController) Download(c *gin.Context) { neInfo := s.NeInfoService.SelectNeInfoByNeTypeAndNeID(body.NeType, body.NeId) if neInfo.NeId != body.NeId { // 找不到 %s %s 对应网元信息 - msg := fmt.Sprintf("Cannot find %s %s network element information.", body.NeType, body.NeId) + msg := i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId}) c.JSON(200, result.ErrMsg(msg)) return } @@ -114,6 +118,7 @@ func (s *TcpdumpController) Download(c *gin.Context) { // // POST /neUPF func (s *TcpdumpController) NeUPFTask(c *gin.Context) { + language := ctx.AcceptLanguage(c) var body struct { NeType string `json:"neType" binding:"required"` // 网元类型 NeId string `json:"neId" binding:"required"` // 网元ID @@ -123,14 +128,14 @@ func (s *TcpdumpController) NeUPFTask(c *gin.Context) { } err := c.ShouldBindBodyWith(&body, binding.JSON) if err != nil { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } // 检查网元信息 neInfo := s.NeInfoService.SelectNeInfoByNeTypeAndNeID(body.NeType, body.NeId) if neInfo.NeId != body.NeId { - msg := fmt.Sprintf("找不到 %s %s 对应网元信息", body.NeType, body.NeId) + msg := i18n.TTemplate(language, "trace.tcpdump.noData", map[string]any{"type": body.NeType, "id": body.NeId}) c.JSON(200, result.ErrMsg(msg)) return } diff --git a/src/modules/trace/service/tcpdump.impl.go b/src/modules/trace/service/tcpdump.impl.go index 2b81dda1..6b8c005d 100644 --- a/src/modules/trace/service/tcpdump.impl.go +++ b/src/modules/trace/service/tcpdump.impl.go @@ -5,18 +5,18 @@ import ( "net" "time" - netElementService "ems.agt/src/modules/net_element/service" + neService "ems.agt/src/modules/network_element/service" ) // 实例化服务层 TcpdumpImpl 结构体 var NewTcpdumpImpl = &TcpdumpImpl{ - neInfoService: netElementService.NewNeInfoImpl, + neInfoService: neService.NewNeInfoImpl, } // 通用请求 服务层处理 type TcpdumpImpl struct { // 网元信息服务 - neInfoService netElementService.INeInfo + neInfoService neService.INeInfo } // UPFTelnetStart UPF进行telnet抓包 diff --git a/src/modules/trace/trace.go b/src/modules/trace/trace.go index 14556e11..66b4e9f7 100644 --- a/src/modules/trace/trace.go +++ b/src/modules/trace/trace.go @@ -18,17 +18,17 @@ func Setup(router *gin.Engine) { { tcpdumpGroup.POST("/ne", middleware.PreAuthorize(nil), - collectlogs.OperateLog(collectlogs.OptionNew("Signaling Grab", collectlogs.BUSINESS_TYPE_OTHER)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.tcpdump", collectlogs.BUSINESS_TYPE_OTHER)), controller.NewTcpdump.NeTask, ) tcpdumpGroup.POST("/neUPF", middleware.PreAuthorize(nil), - collectlogs.OperateLog(collectlogs.OptionNew("Signaling Grab", collectlogs.BUSINESS_TYPE_OTHER)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.tcpdump", collectlogs.BUSINESS_TYPE_OTHER)), controller.NewTcpdump.NeUPFTask, ) tcpdumpGroup.POST("/download", middleware.PreAuthorize(nil), - collectlogs.OperateLog(collectlogs.OptionNew("Signaling Grab", collectlogs.BUSINESS_TYPE_IMPORT)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.tcpdump", collectlogs.BUSINESS_TYPE_IMPORT)), controller.NewTcpdump.Download, ) }