update

Author: kindevil

controller/dashboard.go

@@ -8,17 +8,11 @@
 package controller
 
 import (
-	"github.com/gin-gonic/gin"
 	"net/http"
-	"pi-monitor/device"
+
+	"github.com/gin-gonic/gin"
 )
 
 func Dashboard(c *gin.Context) {
-	var data = gin.H{}
-	var host = device.GetHost()
-
-	data["title"] = host.Vendor + " Monitor"
-	data["host"] = host
-
-	c.HTML(http.StatusOK, "dashboard.tmpl", data)
+	c.HTML(http.StatusOK, "index.html", gin.H{})
 }

main.go

@@ -12,9 +12,5 @@ import (
 )
 
 func main() {
-	//service.InitNetStat()
-	//service.GetNet()
-	// service.GetDisk()
-	// return
 	route.Run()
 }

pi-monitor

@@ -8,15 +8,14 @@
 package route
 
 import (
-	"pi-monitor/api"
 	"pi-monitor/controller"
 	"pi-monitor/websocket"
 )
 
 func route() {
-	server.Gin.LoadHTMLGlob("views/**/*")
-	server.Gin.Static("static/", "static/")
+	server.Gin.LoadHTMLFiles("web/index.html")
+	server.Gin.Static("assets/", "web/assets/")
 	server.Gin.GET("/", controller.Dashboard)
 	server.Gin.GET("/ws", websocket.HandleWebSocket)
-	server.Gin.GET("/api/get", api.Collect)
+	//server.Gin.GET("/api/get", api.Collect)
 }

route/route.go

@@ -5,7 +5,7 @@ import (
 	"github.com/wonderivan/logger"
 )
 
-type device struct {
+type Device struct {
 	Name        string
 	Mountpoint  string
 	Fstype      string
@@ -15,17 +15,19 @@ type device struct {
 	UsedPercent float64
 }
 
-var Disks []*device
+//var Disks []*Device
+
+func GetDisk() []*Device {
+	var Disks []*Device
 
-func GetDisk() []*device {
 	partitions, err := disk.Partitions(false)
 	if err != nil {
 		logger.Error(err)
 	}
 
 	for _, dev := range partitions {
 
-		d := &device{}
+		d := &Device{}
 		d.Name = dev.Device
 		d.Mountpoint = dev.Mountpoint
 		d.Fstype = dev.Fstype

service/disk.go

@@ -14,15 +14,15 @@ import (
 )
 
 type Host struct {
-	Hostname     string    // 主机名
-	OS           string    // 系统版本
-	Vendor       string    // 厂家
-	Model        string    // 硬件版本
-	Serial       string    // 序列号
-	BootTime     string    // 启动时间
-	Kernal       string    // 内核信息
-	InterfaceNum int       // 网卡数
-	Disks        []*device // 存储设备
+	Hostname     string // 主机名
+	OS           string // 系统版本
+	Vendor       string // 厂家
+	Model        string // 硬件版本
+	Serial       string // 序列号
+	BootTime     string // 启动时间
+	Kernal       string // 内核信息
+	InterfaceNum int    // 网卡数
+	//Disks        []*Device // 存储设备
 }
 
 type UpTime struct {
@@ -100,17 +100,17 @@ func kernel() {
 }
 
 func netInterface() {
-	n := GetNet().Interface
-	nt := &netInter{}
-	nt.Count = len(n)
-	for _, val := range n {
-		nt.Names = append(nt.Names, val.Name)
-	}
+	// n := GetNet().Interface
+	// nt := &netInter{}
+	// nt.Count = len(n)
+	// for _, val := range n {
+	// 	nt.Names = append(nt.Names, val.Name)
+	// }
 }
 
-func diskDevice() {
-	hostInfo.Disks = GetDisk()
-}
+// func diskDevice() {
+// 	hostInfo.Disks = GetDisk()
+// }
 
 //readLine 读取文件第一行
 func readLine(path string) string {
@@ -251,8 +251,8 @@ func getHost() {
 	serial()
 	bootTime(info.BootTime)
 	kernel()
-	hostInfo.InterfaceNum = len(GetNet().Interface)
-	diskDevice()
+	hostInfo.InterfaceNum = len(GetNet())
+	//diskDevice()
 }
 
 func GetHost() *Host {

service/host.go

@@ -8,10 +8,10 @@ import (
 )
 
 type Net struct {
-	Interface []*inter
+	Interface []*Inter
 }
 
-type inter struct {
+type Inter struct {
 	Name         string
 	HardwareAddr string
 	Addrs        net.InterfaceAddrList
@@ -44,7 +44,7 @@ func loadNetStat() []net.IOCountersStat {
 // 	logger.Debug(netLastTime)
 // }
 
-func GetNet() *Net {
+func GetNet() []*Inter {
 
 	list, err := net.Interfaces()
 	if err != nil {
@@ -56,7 +56,8 @@ func GetNet() *Net {
 		logger.Error(err)
 	}
 
-	n := &Net{}
+	//n := &Net{}
+	var Interface []*Inter
 
 	time.Sleep(time.Second)
 
@@ -72,11 +73,11 @@ func GetNet() *Net {
 		if len(netLastStat) != 0 {
 			old := search(val.Name, netLastStat)
 			diff = float64(timeNow.UnixNano()/1e6-netLastTime.UnixNano()/1e6) / 1000
-			recv = float64(s.BytesRecv-old.BytesRecv) / diff / 1024
-			send = float64(s.BytesSent-old.BytesSent) / diff / 1024
+			recv = float64(s.BytesRecv-old.BytesRecv) / diff
+			send = float64(s.BytesSent-old.BytesSent) / diff
 		}
 
-		i := &inter{
+		i := &Inter{
 			Name:         val.Name,
 			HardwareAddr: val.HardwareAddr,
 			Addrs:        val.Addrs,
@@ -95,13 +96,13 @@ func GetNet() *Net {
 		// 	logger.Info("BytesSent:", s.BytesSent)
 		// 	logger.Info("BytesSent:", old.BytesSent)
 		// }
-		n.Interface = append(n.Interface, i)
+		Interface = append(Interface, i)
 	}
 
 	netLastStat = stat[:]
 	netLastTime = timeNow
 
-	return n
+	return Interface
 }
 
 func search(name string, stat []net.IOCountersStat) net.IOCountersStat {

service/net.go

@@ -19,7 +19,7 @@ func Index(c *gin.Context) {
 	data["boottime"] = host.BootTime
 	data["kernal"] = host.Kernal
 	data["netCount"] = host.InterfaceNum
-	data["disks"] = host.Disks
+	//data["disks"] = host.Disks
 
 	c.HTML(http.StatusOK, "home.tmpl", data)
 }

service/view.go

@@ -14,7 +14,8 @@ type statistics struct {
 	Host   *service.Host
 	CPU    *service.CPU
 	Memory *service.Memory
-	Net    *service.Net
+	Disks  []*service.Device
+	NetDev []*service.Inter
 }
 
 var upgrader = websocket.Upgrader{
@@ -38,7 +39,8 @@ func init() {
 				Host:   service.GetHost(),
 				CPU:    service.GetCPU(),
 				Memory: service.GetMem(),
-				Net:    service.GetNet(),
+				Disks:  service.GetDisk(),
+				NetDev: service.GetNet(),
 			}
 
 			for _, conn := range Conns {
@@ -86,7 +88,8 @@ func Write(conn *websocket.Conn) {
 			Host:   service.GetHost(),
 			CPU:    service.GetCPU(),
 			Memory: service.GetMem(),
-			Net:    service.GetNet(),
+			Disks:  service.GetDisk(),
+			NetDev: service.GetNet(),
 		}
 		logger.Info("timesince:", time.Since(t1))