From ab58e03657a4991e280a44ab6827fd2027b5514d Mon Sep 17 00:00:00 2001 From: yxh Date: Wed, 20 Apr 2022 22:34:06 +0800 Subject: [PATCH] cpuavg --- internal/app/system/controller/sys_monitor.go | 4 ++-- internal/app/system/service/middleware.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/app/system/controller/sys_monitor.go b/internal/app/system/controller/sys_monitor.go index 9553379..9a9cb40 100644 --- a/internal/app/system/controller/sys_monitor.go +++ b/internal/app/system/controller/sys_monitor.go @@ -116,8 +116,8 @@ func (c *sysMonitorController) List(ctx context.Context, req *system.MonitorSear res = &system.MonitorSearchRes{ "cpuNum": cpuNum, "cpuUsed": cpuUsed, - "cpuAvg5": cpuAvg5, - "cpuAvg15": cpuAvg15, + "cpuAvg5": gconv.String(cpuAvg5), + "cpuAvg15": gconv.String(cpuAvg15), "memTotal": memTotal, "goTotal": goTotal, "memUsed": memUsed, diff --git a/internal/app/system/service/middleware.go b/internal/app/system/service/middleware.go index 4c7619d..be35a54 100644 --- a/internal/app/system/service/middleware.go +++ b/internal/app/system/service/middleware.go @@ -64,9 +64,9 @@ func (s *middlewareImpl) Auth(r *ghttp.Request) { accessParamsStr = "?" + gstr.Join(accessParams, "&") } url := gstr.TrimLeft(r.Request.URL.Path, "/") + accessParamsStr - /*if r.Method != "GET" && adminId!=1 && !gstr.Contains(url,"api/v1/system/login"){ + if r.Method != "GET" && adminId != 1 && !gstr.Contains(url, "api/v1/system/login") { libResponse.FailJson(true, r, "对不起!演示系统,不能删改数据!") - }*/ + } //获取无需验证权限的用户id tagSuperAdmin := false User().NotCheckAuthAdminIds(ctx).Iterator(func(v interface{}) bool {