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