From 2541a38b1301aba1480e9caad2d6cc5a3bd8c4dd Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 31 Oct 2023 18:29:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=99=90=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/common/common.go | 50 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/modules/common/common.go b/src/modules/common/common.go index ffdec896..d5d53eb5 100644 --- a/src/modules/common/common.go +++ b/src/modules/common/common.go @@ -15,11 +15,11 @@ func Setup(router *gin.Engine) { // 路由主页 indexGroup := router.Group("/") indexGroup.GET("", - middleware.RateLimit(middleware.LimitOption{ - Time: 300, - Count: 10, - Type: middleware.LIMIT_IP, - }), + // middleware.RateLimit(middleware.LimitOption{ + // Time: 300, + // Count: 10, + // Type: middleware.LIMIT_IP, + // }), controller.NewIndex.Handler, ) @@ -28,32 +28,32 @@ func Setup(router *gin.Engine) { // 验证码操作处理 indexGroup.GET("/captchaImage", - middleware.RateLimit(middleware.LimitOption{ - Time: 300, - Count: 60, - Type: middleware.LIMIT_IP, - }), + // middleware.RateLimit(middleware.LimitOption{ + // Time: 300, + // Count: 60, + // Type: middleware.LIMIT_IP, + // }), controller.NewCaptcha.Image, ) // 账号身份操作处理 { indexGroup.POST("/login", - middleware.RateLimit(middleware.LimitOption{ - Time: 300, - Count: 10, - Type: middleware.LIMIT_IP, - }), + // middleware.RateLimit(middleware.LimitOption{ + // Time: 300, + // Count: 10, + // Type: middleware.LIMIT_IP, + // }), controller.NewAccount.Login, ) indexGroup.GET("/getInfo", middleware.PreAuthorize(nil), controller.NewAccount.Info) indexGroup.GET("/getRouters", middleware.PreAuthorize(nil), controller.NewAccount.Router) indexGroup.POST("/logout", - middleware.RateLimit(middleware.LimitOption{ - Time: 300, - Count: 5, - Type: middleware.LIMIT_IP, - }), + // middleware.RateLimit(middleware.LimitOption{ + // Time: 300, + // Count: 5, + // Type: middleware.LIMIT_IP, + // }), controller.NewAccount.Logout, ) } @@ -61,11 +61,11 @@ func Setup(router *gin.Engine) { // 账号注册操作处理 { indexGroup.POST("/register", - middleware.RateLimit(middleware.LimitOption{ - Time: 300, - Count: 10, - Type: middleware.LIMIT_IP, - }), + // middleware.RateLimit(middleware.LimitOption{ + // Time: 300, + // Count: 10, + // Type: middleware.LIMIT_IP, + // }), controller.NewRegister.Register, ) } From 4e55820bc89e5b6bdc991fa09606a187c7cc9d65 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 31 Oct 2023 18:37:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=9B=91=E6=8E=A7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/monitor/service/monitor.go | 2 +- src/modules/monitor/service/monitor.impl.go | 36 ++++----------------- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/src/modules/monitor/service/monitor.go b/src/modules/monitor/service/monitor.go index 0ed14547..5e836cc8 100644 --- a/src/modules/monitor/service/monitor.go +++ b/src/modules/monitor/service/monitor.go @@ -10,5 +10,5 @@ type IMonitor interface { RunMonitorDataCancel(removeBefore bool, interval float64) // SelectMonitorInfo 查询监控资源信息 - SelectMonitorInfo(query map[string]any) map[string]MonitorData + SelectMonitorInfo(query map[string]any) map[string]any } diff --git a/src/modules/monitor/service/monitor.impl.go b/src/modules/monitor/service/monitor.impl.go index b391745d..6defe4bc 100644 --- a/src/modules/monitor/service/monitor.impl.go +++ b/src/modules/monitor/service/monitor.impl.go @@ -212,14 +212,8 @@ func (s *MonitorImpl) saveNetDataToDB(ctx context.Context, interval float64) { } } -// MonitorData 监控资源信息 -type MonitorData struct { - Date []int64 `json:"date"` - Value []any `json:"value"` -} - // SelectMonitorInfo 查询监控资源信息 -func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]MonitorData { +func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]any { infoType := query["type"] startTimeMilli := query["startTime"] endTimeMilli := query["endTime"] @@ -228,7 +222,7 @@ func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]Monitor name := query["name"] // 返回数据 - backdatas := map[string]MonitorData{} + backDatas := map[string]any{} // 基本信息 if infoType == "all" || infoType == "cpu" || infoType == "memory" { @@ -238,13 +232,7 @@ func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]Monitor "neType": neType, "neId": neId, }) - // 组装数据 - var itemData MonitorData - for _, base := range rows { - itemData.Date = append(itemData.Date, base.CreateTime) - itemData.Value = append(itemData.Value, base) - } - backdatas["base"] = itemData + backDatas["base"] = rows } // 磁盘IO @@ -256,13 +244,7 @@ func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]Monitor "neId": neId, "name": name, }) - // 组装数据 - var itemData MonitorData - for _, base := range rows { - itemData.Date = append(itemData.Date, base.CreateTime) - itemData.Value = append(itemData.Value, base) - } - backdatas["io"] = itemData + backDatas["io"] = rows } // 网络 @@ -274,14 +256,8 @@ func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]Monitor "neId": neId, "name": name, }) - // 组装数据 - var itemData MonitorData - for _, base := range rows { - itemData.Date = append(itemData.Date, base.CreateTime) - itemData.Value = append(itemData.Value, base) - } - backdatas["network"] = itemData + backDatas["network"] = rows } - return backdatas + return backDatas }