From f48262ca6640df801d7f01b4b8df82313825f5e3 Mon Sep 17 00:00:00 2001 From: dabuge Date: Sun, 2 Apr 2023 11:45:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20gopsutil=20=E5=88=B03.23.3?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BB=A5=E6=94=AF=E6=8C=81=E8=8B=B9?= =?UTF-8?q?=E6=9E=9C=20m1/m2=20=E8=8A=AF=E7=89=87=EF=BC=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96CPU=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/go.mod | 17 ++++++----------- .../websocket/handler/admin/monitor.go | 10 +++++----- server/internal/logic/admin/monitor.go | 4 ++-- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/server/go.mod b/server/go.mod index 40d9115..54e5b31 100644 --- a/server/go.mod +++ b/server/go.mod @@ -14,7 +14,6 @@ require ( github.com/casbin/casbin/v2 v2.55.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/forgoer/openssl v1.4.0 - github.com/fwhezfwhez/errorx v1.1.0 github.com/go-resty/resty/v2 v2.7.0 github.com/gogf/gf/contrib/drivers/mysql/v2 v2.3.3 github.com/gogf/gf/contrib/nosql/redis/v2 v2.3.3 @@ -24,10 +23,9 @@ require ( github.com/kayon/iploc v0.0.0-20200312105652-bda3e968a794 github.com/mojocn/base64Captcha v1.3.5 github.com/olekukonko/tablewriter v0.0.5 - github.com/shirou/gopsutil v3.21.11+incompatible + github.com/shirou/gopsutil/v3 v3.23.3 github.com/shopspring/decimal v1.3.1 github.com/ufilesdk-dev/ufile-gosdk v1.0.3 - github.com/xtaci/kcp-go v5.4.20+incompatible github.com/xuri/excelize/v2 v2.6.0 golang.org/x/tools v0.6.0 gopkg.in/yaml.v3 v3.0.1 @@ -58,7 +56,6 @@ require ( github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect - github.com/gofrs/uuid v4.0.0+incompatible // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -74,8 +71,7 @@ require ( github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.15.6 // indirect - github.com/klauspost/cpuid/v2 v2.1.1 // indirect - github.com/klauspost/reedsolomon v1.11.7 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect @@ -85,20 +81,19 @@ require ( github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/pierrec/lz4/v4 v4.1.14 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/richardlehane/mscfb v1.0.4 // indirect github.com/richardlehane/msoleps v1.0.1 // indirect github.com/rivo/uniseg v0.4.4 // indirect + github.com/shoenig/go-m1cpu v0.1.4 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect - github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect github.com/tidwall/gjson v1.2.1 // indirect github.com/tidwall/match v1.0.1 // indirect github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65 // indirect github.com/tjfoc/gmsm v1.3.2 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect - github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8 // indirect github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect diff --git a/server/internal/controller/websocket/handler/admin/monitor.go b/server/internal/controller/websocket/handler/admin/monitor.go index fce5da4..1f830e1 100644 --- a/server/internal/controller/websocket/handler/admin/monitor.go +++ b/server/internal/controller/websocket/handler/admin/monitor.go @@ -10,11 +10,11 @@ import ( "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/util/gconv" - "github.com/shirou/gopsutil/cpu" - "github.com/shirou/gopsutil/disk" - "github.com/shirou/gopsutil/host" - "github.com/shirou/gopsutil/mem" - "github.com/shirou/gopsutil/process" + "github.com/shirou/gopsutil/v3/cpu" + "github.com/shirou/gopsutil/v3/disk" + "github.com/shirou/gopsutil/v3/host" + "github.com/shirou/gopsutil/v3/mem" + "github.com/shirou/gopsutil/v3/process" "hotgo/internal/consts" "hotgo/internal/model" "hotgo/internal/service" diff --git a/server/internal/logic/admin/monitor.go b/server/internal/logic/admin/monitor.go index 7053fb1..b97004c 100644 --- a/server/internal/logic/admin/monitor.go +++ b/server/internal/logic/admin/monitor.go @@ -5,8 +5,8 @@ import ( "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gcron" "github.com/gogf/gf/v2/os/gtime" - "github.com/shirou/gopsutil/load" - "github.com/shirou/gopsutil/net" + "github.com/shirou/gopsutil/v3/load" + "github.com/shirou/gopsutil/v3/net" "hotgo/internal/library/location" "hotgo/internal/model" "hotgo/internal/service"