Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authormhsanaei <ho3ein.sanaei@gmail.com>2024-06-17 22:48:49 +0300
committermhsanaei <ho3ein.sanaei@gmail.com>2024-06-17 22:48:49 +0300
commit28ede36a103242317b2d1c7200a4c83d31bfc61e (patch)
tree4a9ace1ec68252702727fb0d5ad52e95ed5f3293 /web
parent5036e9e28af4c0365df669b9bb949ca7a7a5279e (diff)
gopsutil v4
Diffstat (limited to 'web')
-rw-r--r--web/html/xui/index.html2
-rw-r--r--web/job/check_cpu_usage.go2
-rw-r--r--web/service/server.go12
3 files changed, 8 insertions, 8 deletions
diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index c179660b..f1583a8f 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -48,7 +48,7 @@
<div><b>CPU:</b> [[ cpuCoreFormat(status.cpuCores) ]] <a-tooltip>
<a-icon type="area-chart"></a-icon>
<template slot="title">
- <div><b>Logical Processors(vCPUs):</b> [[ (status.logicalPro) ]]</div>
+ <div><b>Logical Processors:</b> [[ (status.logicalPro) ]]</div>
<div><b>Speed:</b> [[ cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
</template>
</a-tooltip></div>
diff --git a/web/job/check_cpu_usage.go b/web/job/check_cpu_usage.go
index b84ad054..30ce4db6 100644
--- a/web/job/check_cpu_usage.go
+++ b/web/job/check_cpu_usage.go
@@ -6,7 +6,7 @@ import (
"x-ui/web/service"
- "github.com/shirou/gopsutil/v3/cpu"
+ "github.com/shirou/gopsutil/v4/cpu"
)
type CheckCpuJob struct {
diff --git a/web/service/server.go b/web/service/server.go
index ce7f1994..254dac63 100644
--- a/web/service/server.go
+++ b/web/service/server.go
@@ -23,12 +23,12 @@ import (
"x-ui/util/sys"
"x-ui/xray"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/disk"
- "github.com/shirou/gopsutil/v3/host"
- "github.com/shirou/gopsutil/v3/load"
- "github.com/shirou/gopsutil/v3/mem"
- "github.com/shirou/gopsutil/v3/net"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/disk"
+ "github.com/shirou/gopsutil/v4/host"
+ "github.com/shirou/gopsutil/v4/load"
+ "github.com/shirou/gopsutil/v4/mem"
+ "github.com/shirou/gopsutil/v4/net"
)
type ProcessState string