From 18149365abd5b952e42406007a9b242f4583c734 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 17 Aug 2023 10:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=BD=E5=85=A5=E7=9B=91=E6=8E=A7=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/monitor/monitor/monitor.go | 9 ++++++---
 features/monitor/monitor/task.go    | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/features/monitor/monitor/monitor.go b/features/monitor/monitor/monitor.go
index d9815668..5cacfc21 100644
--- a/features/monitor/monitor/monitor.go
+++ b/features/monitor/monitor/monitor.go
@@ -68,8 +68,9 @@ func LoadMonitor(w http.ResponseWriter, r *http.Request) {
 	var backdatas []MonitorData
 	if bodyArgs.Param == "all" || bodyArgs.Param == "cpu" || bodyArgs.Param == "memory" || bodyArgs.Param == "load" {
 		var bases []MonitorBase
-		err := dborm.DbClient.XEngine.SQL("SELECT * FROM monitor_base").
+		err := dborm.DbClient.XEngine.Table("monitor_base").
 			Where("created_at > ? AND created_at < ?", bodyArgs.StartTime, bodyArgs.EndTime).
+			Desc("created_at").
 			Find(&bases)
 		if err != nil {
 			services.ResponseErrorWithJson(w, 400, err.Error())
@@ -86,8 +87,9 @@ func LoadMonitor(w http.ResponseWriter, r *http.Request) {
 	}
 	if bodyArgs.Param == "all" || bodyArgs.Param == "io" {
 		var bases []MonitorIO
-		err := dborm.DbClient.XEngine.SQL("SELECT * FROM monitor_io").
+		err := dborm.DbClient.XEngine.Table("monitor_io").
 			Where("created_at > ? AND created_at < ?", bodyArgs.StartTime, bodyArgs.EndTime).
+			Desc("created_at").
 			Find(&bases)
 		if err != nil {
 			services.ResponseErrorWithJson(w, 400, err.Error())
@@ -104,8 +106,9 @@ func LoadMonitor(w http.ResponseWriter, r *http.Request) {
 	}
 	if bodyArgs.Param == "all" || bodyArgs.Param == "network" {
 		var bases []MonitorNetwork
-		err := dborm.DbClient.XEngine.SQL("SELECT * FROM monitor_network").
+		err := dborm.DbClient.XEngine.Table("monitor_network").
 			Where("name = ? AND created_at > ? AND created_at < ?", bodyArgs.Info, bodyArgs.StartTime, bodyArgs.EndTime).
+			Desc("created_at").
 			Find(&bases)
 		if err != nil {
 			services.ResponseErrorWithJson(w, 400, err.Error())
diff --git a/features/monitor/monitor/task.go b/features/monitor/monitor/task.go
index 8c6736d7..a8185c32 100644
--- a/features/monitor/monitor/task.go
+++ b/features/monitor/monitor/task.go
@@ -186,11 +186,10 @@ func loadNetIO() {
 		}
 	}
 
-	rows, err := dborm.DbClient.XEngine.Table("monitor_network").Insert(netList)
+	_, err := dborm.DbClient.XEngine.Table("monitor_network").Insert(netList)
 	if err != nil {
 		log.Errorf("Insert network monitoring data failed, err: %v", err)
 	}
-	fmt.Println(rows, err)
 }
 
 var c *cron.Cron
@@ -198,6 +197,7 @@ var monitorCronID int
 
 func init() {
 	c = cron.New()
+	c.Start()
 	monitorCronID = 0
 }