commit

aarch64/pjisuv/common/config/c_resource.go

@@ -0,0 +1,5 @@
+package config
+
+func SendResourceUsage() {
+
+}

aarch64/pjisuv/control/main.go

@@ -21,6 +21,9 @@ func init() {
 	config.InitOssConfig()
 	// 初始化业务逻辑配置信息，配置文件在oss上（第2处配置，在oss文件）
 	config.InitCloudConfig()
+	{ // 获取资源信息
+
+	}
 }
 
 func main() {

amd64/web_server/Dockerfile

@@ -0,0 +1,8 @@
+FROM golang:1.22
+RUN mkdir /web_server
+WORKDIR /web_server
+ADD . /web_server
+RUN go build -o main.exe ./main.go
+CMD /web_server/main.exe
+EXPOSE 12341
+

amd64/web-server/application.yaml → amd64/web_server/application.yaml

@@ -1,6 +1,6 @@
 application-name: web-server
 web:
-  port: 12345
+  port: 12341
   route-prefix: /web-server
   token: U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM
   white-list:
@@ -15,5 +15,6 @@ mysql:
   password: 1qaz2wsx!
   dbname: dataclosedloop
   charset: utf8
-  sqlfile-dir: D:\code\cicv-data-closedloop\amd64\web-server\sql
+  sqlfile-dir: /web_server/sql
+#  sqlfile-dir: D:\code\cicv-data-closedloop\amd64\web-server\sql
 

amd64/web-server/handler/h_report.go → amd64/web_server/handler/h_report.go

@@ -1,7 +1,7 @@
 package handler
 
 import (
-	"cicv-data-closedloop/amd64/web-server/entity"
+	"cicv-data-closedloop/amd64/web_server/entity"
 	"cicv-data-closedloop/common/config/c_log"
 	commonEntity "cicv-data-closedloop/common/entity"
 	"cicv-data-closedloop/common/util"

amd64/web-server/main.go → amd64/web_server/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"cicv-data-closedloop/amd64/web-server/handler"
+	"cicv-data-closedloop/amd64/web_server/handler"
 	"cicv-data-closedloop/common/config/c_db"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/gin/middleware"

common/util/u_disk.go → common/util/u_resource.go

@@ -1,11 +1,34 @@
 package util
 
 import (
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/disk"
+	"github.com/shirou/gopsutil/mem"
 	"os/exec"
 	"strconv"
 	"strings"
+	"time"
 )
 
+// GetCpuPercent cpu总占用率
+func GetCpuPercent() float64 {
+	percent, _ := cpu.Percent(time.Second, false)
+	return percent[0]
+}
+
+// GetMemoryPercent 内存总占用率
+func GetMemoryPercent() float64 {
+	memory, _ := mem.SwapMemory()
+	return memory.UsedPercent
+}
+
+// GetDiskPercent 磁盘总占用率
+func GetDiskPercent() float64 {
+	parts, _ := disk.Partitions(true)
+	diskInfo, _ := disk.Usage(parts[0].Mountpoint)
+	return diskInfo.UsedPercent
+}
+
 // GetDiskUsed 解析 df 命令的输出
 // df -B1 /dev/vdb
 // Filesystem        1B-blocks        Used    Available Use% Mounted on

test/monitor/main/main.go

@@ -8,16 +8,19 @@ import (
 	"time"
 )
 
+// GetCpuPercent cpu总占用率
 func GetCpuPercent() float64 {
 	percent, _ := cpu.Percent(time.Second, false)
 	return percent[0]
 }
 
+// GetMemoryPercent 内存总占用率
 func GetMemoryPercent() float64 {
 	memory, _ := mem.SwapMemory()
 	return memory.UsedPercent
 }
 
+// GetDiskPercent 磁盘总占用率
 func GetDiskPercent() float64 {
 	parts, _ := disk.Partitions(true)
 	diskInfo, _ := disk.Usage(parts[0].Mountpoint)
@@ -25,7 +28,7 @@ func GetDiskPercent() float64 {
 }
 
 func main() {
-	fmt.Println("cpu总占用为：", GetCpuPercent())
-	fmt.Println("内存总占用为：", GetMemoryPercent())
-	fmt.Println("磁盘总占用为：", GetDiskPercent())
+	fmt.Println("cpu总占用率为：", GetCpuPercent())
+	fmt.Println("内存总占用率为：", GetMemoryPercent())
+	fmt.Println("磁盘总占用率为：", GetDiskPercent())
 }