diff --git a/app/controller/admin/monitor_server.go b/app/controller/admin/monitor_server.go index ece365b..b018422 100644 --- a/app/controller/admin/monitor_server.go +++ b/app/controller/admin/monitor_server.go @@ -7,6 +7,7 @@ import ( "github.com/gogf/gf/frame/g" "github.com/gogf/gf/net/ghttp" "github.com/gogf/gf/os/gtime" + "github.com/gogf/gf/util/gconv" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/disk" "github.com/shirou/gopsutil/host" @@ -48,8 +49,8 @@ func (c *MonitorServer) Info(r *ghttp.Request) { v, err := mem.VirtualMemory() if err == nil { memTotal = v.Total / 1024 / 1024 - memFree = v.Free / 1024 / 1024 memUsed = v.Used / 1024 / 1024 + memFree = memTotal - memUsed memUsage, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", v.UsedPercent), 64) } @@ -61,7 +62,7 @@ func (c *MonitorServer) Info(r *ghttp.Request) { var gomem runtime.MemStats runtime.ReadMemStats(&gomem) goUsed = gomem.Sys / 1024 / 1024 - + goUsage = gconv.Float64(fmt.Sprintf("%.2f", gconv.Float64(goUsed)/gconv.Float64(memTotal)*100)) sysComputerIp := "" //服务器IP ip, err := utils.GetLocalIP() diff --git a/go.mod b/go.mod index a76b730..5984782 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ require ( github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/casbin/casbin/v2 v2.1.2 github.com/go-ole/go-ole v1.2.4 // indirect - github.com/goflyfox/gtoken v1.3.12 + github.com/goflyfox/gtoken v1.3.14 github.com/gogf/gf v1.11.7 github.com/mojocn/base64Captcha v1.3.0 github.com/mssola/user_agent v0.5.1 diff --git a/go.sum b/go.sum index 9a9fe57..a4abd27 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,8 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/goflyfox/gtoken v1.3.12 h1:ewet3ZzkfBIuOKkJ2T9uErheDAu/TxnyrmMmEaof2F8= github.com/goflyfox/gtoken v1.3.12/go.mod h1:KPGDYrhvNzcfqFJz4/rE6x0SyURAuAxfRNhwMxGbFxk= +github.com/goflyfox/gtoken v1.3.14 h1:nQZDLbkQ/O0jAgAsP83jz+cofkuSDHWGha41p77LYEM= +github.com/goflyfox/gtoken v1.3.14/go.mod h1:Tr2qiuVA9dnOPfLzTLch/QGuaonSKcoVrHxY0T4Tvmc= github.com/gogf/gf v1.11.5 h1:e6HB9x1QZ6EFD3eEWXDCsFeVs7KxNtmWQRVNh2c0+bQ= github.com/gogf/gf v1.11.5/go.mod h1:iuHZkqyEfxFtpwRYboAU7409O/sfdy79YTpY8si332I= github.com/gogf/gf v1.11.7 h1:rHt9g7OP3NPkkgQpN73zA9TJ4ItlQGworY1Jxb6mgQE= diff --git a/public/resource/index.html b/public/resource/index.html new file mode 100644 index 0000000..1431d4c --- /dev/null +++ b/public/resource/index.html @@ -0,0 +1 @@ +