From f114424079b7e55ad5ad61af150a95acaf459cb4 Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Sun, 13 Feb 2022 00:23:20 +0800
Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B:=20fix=20monitor=20macos=20env?=
 =?UTF-8?q?=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/other/apis/sys_server_monitor.go | 125 +++++++++++++++++++++------
 go-admin-db.db                       | Bin 335872 -> 335872 bytes
 go.mod                               |   5 +-
 3 files changed, 100 insertions(+), 30 deletions(-)

diff --git a/app/other/apis/sys_server_monitor.go b/app/other/apis/sys_server_monitor.go
index a8054052..a7a4172e 100644
--- a/app/other/apis/sys_server_monitor.go
+++ b/app/other/apis/sys_server_monitor.go
@@ -2,18 +2,21 @@ package apis
 
 import (
 	"fmt"
-	"github.com/shirou/gopsutil/host"
+	"github.com/shirou/gopsutil/v3/net"
+	"regexp"
 	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/disk"
-	"github.com/shirou/gopsutil/mem"
+	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/host"
+	"github.com/shirou/gopsutil/v3/mem"
 )
 
 const (
@@ -23,11 +26,28 @@ const (
 	GB = 1024 * MB
 )
 
+var (
+	Version           string
+	expectDiskFsTypes = []string{
+		"apfs", "ext4", "ext3", "ext2", "f2fs", "reiserfs", "jfs", "btrfs",
+		"fuseblk", "zfs", "simfs", "ntfs", "fat32", "exfat", "xfs", "fuse.rclone",
+	}
+	excludeNetInterfaces = []string{
+		"lo", "tun", "docker", "veth", "br-", "vmbr", "vnet", "kube",
+	}
+	getMacDiskNo = regexp.MustCompile(`\/dev\/disk(\d)s.*`)
+)
+
+var (
+	netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdateNetStats uint64
+	cachedBootTime                                                             time.Time
+)
+
 type ServerMonitor struct {
 	api.Api
 }
 
-//获取相差时间
+// GetHourDiffer 获取相差时间
 func GetHourDiffer(startTime, endTime string) int64 {
 	var hour int64
 	t1, err := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local)
@@ -64,33 +84,28 @@ func (e ServerMonitor) ServerInfo(c *gin.Context) {
 	osDic["hostName"] = sysInfo.Hostname
 	osDic["time"] = time.Now().Format("2006-01-02 15:04:05")
 
-	dis, _ := disk.Usage("/")
-	diskTotalGB := int(dis.Total) / GB
-	diskFreeGB := int(dis.Free) / GB
-	diskDic := make(map[string]interface{}, 0)
-	diskDic["total"] = diskTotalGB
-	diskDic["free"] = diskFreeGB
-
 	mem, _ := mem.VirtualMemory()
-	memUsedMB := int(mem.Used) / GB
-	memTotalMB := int(mem.Total) / GB
-	memFreeMB := int(mem.Free) / GB
-	memUsedPercent := int(mem.UsedPercent)
 	memDic := make(map[string]interface{}, 0)
-	memDic["total"] = memTotalMB
-	memDic["used"] = memUsedMB
-	memDic["free"] = memFreeMB
-	memDic["usage"] = memUsedPercent
+	memDic["used"] = mem.Used / MB
+	memDic["total"] = mem.Total / MB
+
+	fmt.Println("mem", int(mem.Total/mem.Used*100))
+	memDic["percent"] = pkg.Round(mem.UsedPercent, 2)
+
+	swapDic := make(map[string]interface{}, 0)
+	swapDic["used"] = mem.SwapTotal - mem.SwapFree
+	swapDic["total"] = mem.SwapTotal
 
 	cpuDic := make(map[string]interface{}, 0)
 	cpuDic["cpuInfo"], _ = cpu.Info()
 	percent, _ := cpu.Percent(0, false)
-	cpuDic["Percent"] = pkg.Round(percent[0], 2)
+	cpuDic["percent"] = pkg.Round(percent[0], 2)
 	cpuDic["cpuNum"], _ = cpu.Counts(false)
 
 	//服务器磁盘信息
 	disklist := make([]disk.UsageStat, 0)
 	//所有分区
+	var diskTotal, diskUsed, diskUsedPercent float64
 	diskInfo, err := disk.Partitions(true)
 	if err == nil {
 		for _, p := range diskInfo {
@@ -101,16 +116,72 @@ func (e ServerMonitor) ServerInfo(c *gin.Context) {
 				diskDetail.Used = diskDetail.Used / 1024 / 1024
 				diskDetail.Free = diskDetail.Free / 1024 / 1024
 				disklist = append(disklist, *diskDetail)
+
 			}
 		}
 	}
 
+	d, _ := disk.Usage("/")
+
+	diskTotal = float64(d.Total / GB)
+	diskUsed = float64(d.Used / GB)
+	diskUsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", d.UsedPercent), 64)
+
+	diskDic := make(map[string]interface{}, 0)
+	diskDic["total"] = diskTotal
+	diskDic["used"] = diskUsed
+	diskDic["percent"] = diskUsedPercent
+
+	bootTime, _ := host.BootTime()
+	cachedBootTime = time.Unix(int64(bootTime), 0)
+
+	TrackNetworkSpeed()
+	netDic := make(map[string]interface{}, 0)
+	netDic["in"] = pkg.Round(float64(netInSpeed/KB), 2)
+	netDic["out"] = pkg.Round(float64(netOutSpeed/KB), 2)
 	e.Custom(gin.H{
-		"code": 200,
-		"os":   osDic,
-		"mem":  memDic,
-		"cpu":  cpuDic,
-		"disk": diskDic,
-		"diskList": disklist,
+		"code":     200,
+		"os":       osDic,
+		"mem":      memDic,
+		"cpu":      cpuDic,
+		"disk":     diskDic,
+		"net":      netDic,
+		"swap":     swapDic,
+		"location": "Aliyun",
+		"bootTime": GetHourDiffer(cachedBootTime.Format("2006-01-02 15:04:05"), time.Now().Format("2006-01-02 15:04:05")),
 	})
 }
+
+func TrackNetworkSpeed() {
+	var innerNetInTransfer, innerNetOutTransfer uint64
+	nc, err := net.IOCounters(true)
+	if err == nil {
+		for _, v := range nc {
+			if isListContainsStr(excludeNetInterfaces, v.Name) {
+				continue
+			}
+			innerNetInTransfer += v.BytesRecv
+			innerNetOutTransfer += v.BytesSent
+		}
+		now := uint64(time.Now().Unix())
+		diff := now - lastUpdateNetStats
+		if diff > 0 {
+			netInSpeed = (innerNetInTransfer - netInTransfer) / diff
+			fmt.Println("netInSpeed", netInSpeed)
+			netOutSpeed = (innerNetOutTransfer - netOutTransfer) / diff
+			fmt.Println("netOutSpeed", netOutSpeed)
+		}
+		netInTransfer = innerNetInTransfer
+		netOutTransfer = innerNetOutTransfer
+		lastUpdateNetStats = now
+	}
+}
+
+func isListContainsStr(list []string, str string) bool {
+	for i := 0; i < len(list); i++ {
+		if strings.Contains(str, list[i]) {
+			return true
+		}
+	}
+	return false
+}
diff --git a/go-admin-db.db b/go-admin-db.db
index 5152f46f01355ce66606ca35ebb7339afcce872c..ca8e07201def51a5fcf3b6866d6711da66da7a2c 100644
GIT binary patch
delta 2143
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

delta 4615
zcmbVP3vd+W9sj;>zrDM?-M!7_E{`(?j$m@e%i}JW<Swy10wiHfFbSko6ii|gVtC|@
zn(|0i2ce=ujPmLDAhp^83LK{Gwq?-FI8#NfghC69)`}1yg$_ZiR36%I_Z~TtG@a?)
z?9Kna|LgaE?Ek;pJz(t~ux?8*9|Hg^q*n&LIC?$MljdQMfsB%E`|ElnosS;HP4B-h
zadrcU0zkSh9qKpFJ}4m<>K&XF>vX4QW!bab`EFmnCp*LI^Je>ePM0s=<zgTMfRXBJ
zdN-th^qU92kP^*|1G;na^4xi@T%RX5Cl4_U;KYDjzrOsY#88EPeRYUv8Aogjo%DqW
z|4k_XZ<%RVzuEPwsejj}5A?uj!d62E0tb|gYWSfMZXp|1z}raqD#-PGF%9LV^!AzT
z<R^QPjpBr8t^>+l(}~;+t;+K&;VLWyVX5FM6rlxPkfO@vPWrD*t`3H#=(}M6hN9mV
zruyJ_Qf!3w0-CsQrOVQgbU}&r!^2V%HFB@48eS+%^tW^c{VADCe=_a}TOJ788>PMs
zpN#~m-{{fJt%2}wNLOi=FG%F-4kYT#@O@zVo*4R&U4ZWgzWfFLbWcGX=6`|KDem2<
z4Wcd|k@uk~%ITk@=X4kV=6=$-6TL&e--!&pPjN;vxD)B6H7#{D9raZYbylYWfVzo4
z5vRhm-u-+m8A-%xR1ZZF`xKlIf7jfFg$0#`_R4}erG@tD_RjXIHSP6n)ykqNcn_q4
zAdTehMRzKP-$I!T>bgVAII-?SBY`NcN;iU0yobcGM~6`qXHauRuTl~<h~g|2?7zSp
zY$e{0Ii?QnK?YdY>yBEXyfKKXgMIO~R7v|{zC<c7A^+H1{V?9kILFG>sf=hhYQ6lr
z<Tah3<~}khC+=m^Xh`(V=ok7vmwL)g<m)OXddx}lxRWj>T5WUMJWRNG!c<?F@`tH`
zFf|yaz6?_%lnO+(MY2(3qC{*GKA$64KrAc;#&3<S+z8jKAJ%v4<8*Ja$Jr*9#V;{A
zXaJSKqo&)%x5Zh)pM`u_3P0|5N5w)?YQ~%4{NCMMCc)8oJ}mC7V6DCHa{AtK&O+8k
z<04oTIwB?u=E&J-TmcJ-&w}mn9%YFIZ^O!rKC}rcEjC;UmG0fB3_57p9O{iWt+A=D
z{;|fo$Ew<&XfM&nrKZA7(>iJ%T2-$#jFNvl{)ib{sZ1Q~htWnKccfe`!{Y2fcKh%(
zsR9{694H1-o$0Ue5mOQ<7S{`h!D%#?zrx?gUE-D-{$gPD&AQKYi`heLDt?YR$;2Z<
z)gnK#EmZ(Za?&l9Vp8pgQ^_kv)<EWn>^w5_2yz&s(gaYGoNTca2H5s%m?aH7J2SvG
zJA&*;?I%p^k5qPw(YO!fQFV_chMf8XOe8P=fTMYNVY&d;G*m>o+^CsT9*699y`JLR
zMKO^hSMZ&rm}4JQZwv*jUtK}W$B>nm<1>SpBSBHYBFzfFBtuYzsr?0HKgaG4*nXF1
z7eVrx$o^W-r%=>xCxMr-gRl~NV=;Ub#Dmj-`IIS;I!u>L4~QR#bA+veiQfoL^8oGP
zPIF5PhYb1p-|B6;$JuM_!}vIgMK2;9e3U9jd>A_*pelJZqcgt7#VUlj+uZI9m)Dn<
zof}vsviUxNN+w%kg4w(4I@Z#jf^iwxL7GPJ%e-t|p$d(f(<<=Y6+A}^%V@s;RvVNZ
zC>>{<uhu3q_m&s-u*a}*E!a%9UdAazHKkBfH(7OjZ6saS0*9xRC$HnRc!A*qU}cJc
zwA^&WG($WfP8FVF&hVFve={!OPH>BvB14M4NB51cgngTh!`)zB#5b4`*;1$B6K$l*
z5A9^pFiu%GuduYRvM|e)m6h(&Hmy4^-;<l4<H>OQJgyvXAU*$!FY~nms1;L1+kyq8
z=Q>Vqm{-55zN0>U`RdG?md4CS+?ln_P0Je_CUNKW`8=LU+(qzZ%R>>7BzJ|K4Q=il
ze(8<jCw2~#ogv3{^(`Hfxy{bb&YH~aC|^#h5kP}GQ;iZB3=PfcHFc{Sn=;9(7jY~}
zyojYP&HvCIGPLn`=k^~MdTmP>MPqG8W=CgB{UlIw^E`RklR$~!%SqJ}K_RbP#3_*=
z&c5J3`^?^3K+q*yGZ}~+w<q{~HDT3rLwxx*`F2_bXS&5!d}}&Z`{{F0_aQo+u6~H;
z2L?gB92*c0-C!C&{SzD*6h@0YJ))#`^5J<btq5fE9dhR2GocV#n%l=$lRh1KvhqDS
z87_~<>m84NLcVO4lY%ZwN=S_#PX9mpXw-6++cmz8CSuD8@-zX|C+CQkTid9HH2I-f
zO&m`$E@Pc;c+)fI4(=rdmvL-)W_x`{`Hw3jN)oi4ospO8^SQ_O&4he8S+>)O>~xZ4
zewaj_mDt3Z^Uo?nTelDIe){}A`COkI%5-f_OGoX)HN}M!I`w8}c|DUjjpQre{1G38
z9N!AIYCS;Q!#GK65QR3#Pm#J)HmDqR%}fs@;8!2x`GOoL$7vej{iG#_@@54V$(B#>
zqfGHJU<ES)UZ-!;9oLny2iXj%&2+*vQ&hwRVIzNuuQMJt-p%>JOfH!jV(-A)m~%`4
zlHf}8mTXZy)4^{G4t_cnwU$f~^w$`(%5#RjHx31OaS3DBhg~+&J$QFcSak3dHjufe
zaEZ2V#>vOaBHak|-U;n`DjyJ)#+W8Q{St4ddzf8Hn}+=TE9@k7U*R@Ew#eXC<k~hW
zI*$ti+bDCT0NQ7G!yYvD;wyMrAayH8@GfYyu2yY~!U!!$2YKadyoDA9I#na&)K|1(
zAq#65ECZ4@OgDDO=NV=HFfP|EgT3@gh_0#4;B!#KNT?HjVfx4<@x%OV;|^|!Ycw1&
zB<gqRhIAhBarR9%7C*^+hh9bTu$QWa7nL&>h|W}TsuYt64WbAo$-vPkh}I48J{5i9
zG?y#1xU-p9;7E>f+9Zpc%6dbx|K0#QHCZt%%ls0QkcV4fF_PoSz&dE9HbG!zkdgKD
zf$PRP=+$)Y4C~02^bi)!eh3RV^WNUG&;LH4w|PCx8jH)C7S{7b#xT4dE*XPMcn&Ng
zYujL%P3Giks+OE8PM1V2bWV~uZq@>_wGG~@sU?j<6XdF}aE|IDBy4Vn6`C+VD$J9v
zb{IoVfwMc_JiqUCV()-c$boj~9BbAnFAJMhQyMmF>wsmNFc&tf;5D#HeWe2<q+u=G
zNh$a=v8;o$)mWB>?c5T}%N@a3BFgB?R?C>+Oi;_njh1okTDX2}D0dSxEgqr`;aCT|
z#~>n`-@}~}^B}OHdjPrzFJ(SKCy617y-SDmuo4`lFK#a&Y*UU$vF#Acyj(-%c4$E~
z$wC_}A8W3z1#VR1Ya;(_fh+8?AlHVYicET_k)Ca(X?3*1w6UlK($WfJR5zPigXM|H
z<3%fL<+l%D9BpBvf#F31)_2lrR>bzQ(TZUZ-@wYzDAtA*=Sh50H$^mffwYX?S_?(L
zXcK<MkMK*4{YH^%HT=oorSDfU26b={e)7TO;Q#9&a_Ev|AvAInI&wZkyhYYeJP;j*
YDYA}^8*iTWT0nmI1`EoiA?!f^0VDS4uK)l5

diff --git a/go.mod b/go.mod
index c28d385e..a8a33c66 100644
--- a/go.mod
+++ b/go.mod
@@ -17,12 +17,11 @@ require (
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil v3.21.5+incompatible
+	github.com/shirou/gopsutil/v3 v3.22.1
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.0.0
 	github.com/swaggo/gin-swagger v1.2.0
 	github.com/swaggo/swag v1.6.7
-	github.com/tklauser/go-sysconf v0.3.6 // indirect
 	github.com/unrolled/secure v1.0.8
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
 	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
@@ -31,4 +30,4 @@ require (
 	gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba
 	gorm.io/driver/sqlserver v1.0.4
 	gorm.io/gorm v1.21.11
-)
\ No newline at end of file
+)