From b1ad0680736176f6ef98ff05baa15819a4de4974 Mon Sep 17 00:00:00 2001 From: imbytecat Date: Tue, 27 Aug 2024 15:05:25 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9D=A1=E7=9B=AE=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- integration/zabbixagent/gin_handler.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/integration/zabbixagent/gin_handler.go b/integration/zabbixagent/gin_handler.go index 60bf9cf..dc20beb 100644 --- a/integration/zabbixagent/gin_handler.go +++ b/integration/zabbixagent/gin_handler.go @@ -1,28 +1,26 @@ package zabbixagent import ( + "fmt" "github.com/gin-gonic/gin" - "net/http" "onvif-agent/response" handler "onvif-agent/router/handler/onvif" service "onvif-agent/service/onvif" ) func DiscoverONVIFDevices(c *gin.Context) { - type ZBXDevice struct { + type device struct { Xaddr string `json:"{#XADDR}"` } - arr := make([]ZBXDevice, 0) + devices := make([]device, 0) for xaddr := range service.Sessions { - arr = append(arr, ZBXDevice{ + devices = append(devices, device{ Xaddr: xaddr, }) } - c.JSON(http.StatusOK, gin.H{ - "data": arr, - }) + response.NewResponse().WithData(devices).Send(c) } func RegisterONVIFDevices(c *gin.Context) { @@ -53,7 +51,7 @@ func RegisterONVIFDevices(c *gin.Context) { service.Sessions = sessions - response.NewResponse().Success().Send(c) + response.NewResponse().Success().WithMessage(fmt.Sprintf("%d device(s) registered", len(sessions))).Send(c) } type ConsumeNotificationsRequest struct {