From a1b9bf081c8922bc0194ed86cb160975b464e34c Mon Sep 17 00:00:00 2001
From: PandaX <18610165312@163.com>
Date: Tue, 21 Nov 2023 16:13:52 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E6=9F=A5=E8=AF=A2=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/log/services/log_login.go | 3 +++
 apps/system/api/system.go      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/log/services/log_login.go b/apps/log/services/log_login.go
index 9edb0b7..ce801d1 100644
--- a/apps/log/services/log_login.go
+++ b/apps/log/services/log_login.go
@@ -49,6 +49,9 @@ func (m *logLoginModelImpl) FindListPage(page, pageSize int, data entity.LogLogi
 	if data.LoginLocation != "" {
 		db = db.Where("login_location like ?", "%"+data.LoginLocation+"%")
 	}
+	if data.Username != "" {
+		db = db.Where("username like ?", "%"+data.Username+"%")
+	}
 	err := db.Where("delete_time IS NULL").Count(&total).Error
 	err = db.Order("info_id desc").Limit(pageSize).Offset(offset).Find(&list).Error
 
diff --git a/apps/system/api/system.go b/apps/system/api/system.go
index 1d50000..d296518 100644
--- a/apps/system/api/system.go
+++ b/apps/system/api/system.go
@@ -35,13 +35,13 @@ func (s *System) ServerInfo(request *restful.Request, response *restful.Response
 	diskDic["total"] = info.DiskTotal / GB
 	diskDic["free"] = info.DiskFree / GB
 	diskDic["used"] = info.DiskUsed / GB
-	diskDic["progress"] = int64((float64(info.DiskUsed) / float64(info.DiskTotal)) * 100)
+	diskDic["progress"] = fmt.Sprintf("%.2f", (float64(info.DiskUsed)/float64(info.DiskTotal))*100)
 
 	memDic := make(map[string]any, 0)
 	memDic["total"] = info.MemTotal / GB
 	memDic["used"] = info.MemUsed / GB
 	memDic["free"] = info.MemFree / GB
-	memDic["progress"] = int64((float64(info.MemUsed) / float64(info.MemTotal)) * 100)
+	memDic["progress"] = fmt.Sprintf("%.2f", (float64(info.MemUsed)/float64(info.MemTotal))*100)
 
 	cpuDic := make(map[string]any, 0)
 	cpuDic["num"] = info.CpuNum