From cf1dbf4a0e884ca2c80ac1b6d9bfe77a0d3876c5 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 15 Aug 2024 09:38:41 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E7=9B=91=E6=8E=A7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/monitor/controller/monitor.go     | 21 +++++++------------
 src/modules/monitor/controller/system_info.go |  5 +++--
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/modules/monitor/controller/monitor.go b/src/modules/monitor/controller/monitor.go
index 52e90373..67921d1a 100644
--- a/src/modules/monitor/controller/monitor.go
+++ b/src/modules/monitor/controller/monitor.go
@@ -28,21 +28,14 @@ type MonitorController struct {
 func (s *MonitorController) Load(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var querys struct {
-		// 数据类型all/load/cpu/memory/io/network
-		Type string `form:"type" binding:"required,oneof=all load cpu memory io network"`
-		// 开始时间
-		StartTime int64 `form:"startTime" binding:"required"`
-		// 结束时间
-		EndTime int64 `form:"endTime" binding:"required"`
-		// 网元类型
-		NeType string `form:"neType"`
-		// 网元ID
-		NeID string `form:"neId"`
-		// 名称，networ和iok时有效
-		Name string `form:"name"`
+		Type      string `form:"type" binding:"required,oneof=all load cpu memory io network"` // 数据类型all/load/cpu/memory/io/network
+		StartTime int64  `form:"startTime" binding:"required"`                                 // 开始时间
+		EndTime   int64  `form:"endTime" binding:"required"`                                   // 结束时间
+		NeType    string `form:"neType"`                                                       // 网元类型
+		NeID      string `form:"neId"`                                                         // 网元ID
+		Name      string `form:"name"`                                                         // 名称，networ和io时有效
 	}
-	err := c.ShouldBindQuery(&querys)
-	if err != nil {
+	if err := c.ShouldBindQuery(&querys); err != nil {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
diff --git a/src/modules/monitor/controller/system_info.go b/src/modules/monitor/controller/system_info.go
index a6d47764..d93e0ffa 100644
--- a/src/modules/monitor/controller/system_info.go
+++ b/src/modules/monitor/controller/system_info.go
@@ -24,12 +24,13 @@ type SystemInfoController struct {
 //
 // GET /
 func (s *SystemInfoController) Info(c *gin.Context) {
-	c.JSON(200, result.OkData(map[string]any{
+	data := map[string]any{
 		"cpu":     s.systemInfogService.CPUInfo(),
 		"memory":  s.systemInfogService.MemoryInfo(),
 		"network": s.systemInfogService.NetworkInfo(),
 		"time":    s.systemInfogService.TimeInfo(),
 		"system":  s.systemInfogService.SystemInfo(),
 		"disk":    s.systemInfogService.DiskInfo(),
-	}))
+	}
+	c.JSON(200, result.OkData(data))
 }