github_mirrors/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-08-28 06:56:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

发布v2.2.10版本，更新内容请查看：https://github.com/bufanyun/hotgo/tree/v2.0/docs/guide-zh-CN/addon-version-upgrade.md

Browse Source
This commit is contained in:
孟帅
2023-02-23 17:53:04 +08:00
parent 7cf1b8ce8e
commit 61d0988d2c
402 changed files with 18340 additions and 35547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/internal/controller/websocket/handler/admin/monitor.go
View File

@@ -1,6 +1,6 @@
// Package admin
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2022 HotGo CLI
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
@@ -17,8 +17,8 @@ import (
"github.com/shirou/gopsutil/mem"
"github.com/shirou/gopsutil/process"
"hotgo/internal/consts"
"hotgo/internal/global"
"hotgo/internal/model"
"hotgo/internal/service"
"hotgo/internal/websocket"
"hotgo/utility/file"
"hotgo/utility/format"
@@ -51,6 +51,7 @@ type MonitorHead struct {
func (c *cMonitor) RunInfo(client *websocket.Client, req *websocket.WRequest) {
var (
data = g.Map{}
meta = service.AdminMonitor().GetMeta(client.Context())
mHost, _ = host.Info()
pwd, _ = os.Getwd()
gm runtime.MemStats
@@ -63,14 +64,14 @@ func (c *cMonitor) RunInfo(client *websocket.Client, req *websocket.WRequest) {
"hostname": mHost.Hostname,
"os": mHost.OS,
"arch": mHost.KernelArch,
"intranet_ip": global.MonitorData.IntranetIP,
"public_ip": global.MonitorData.PublicIP,
"intranet_ip": meta.IntranetIP,
"public_ip": meta.PublicIP,
// GO运行信息
"goName": "Golang",
"version": runtime.Version(),
"startTime": global.MonitorData.STartTime,
"runTime": gtime.Now().Timestamp() - global.MonitorData.STartTime.Timestamp(),
"startTime": meta.STartTime,
"runTime": gtime.Now().Timestamp() - meta.STartTime.Timestamp(),
"rootPath": runtime.GOROOT(),
"pwd": pwd,
"goroutine": runtime.NumGoroutine(),
@@ -111,6 +112,7 @@ func (c *cMonitor) Trends(client *websocket.Client, req *websocket.WRequest) {
data = g.Map{}
monitorHeads []MonitorHead
nets []NetC
meta = service.AdminMonitor().GetMeta(client.Context())
)
// cpu使用率
@@ -123,8 +125,8 @@ func (c *cMonitor) Trends(client *websocket.Client, req *websocket.WRequest) {
mMemUsed, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", mMem.UsedPercent), 64)
// 负载
if len(global.MonitorData.LoadAvg) > 0 {
mLoadAvg = global.MonitorData.LoadAvg[len(global.MonitorData.LoadAvg)-1]
if len(meta.LoadAvg) > 0 {
mLoadAvg = meta.LoadAvg[len(meta.LoadAvg)-1]
}
monitorHeads = append(monitorHeads, MonitorHead{
@@ -164,7 +166,7 @@ func (c *cMonitor) Trends(client *websocket.Client, req *websocket.WRequest) {
IconClass: "Analytics",
})
for _, v := range global.MonitorData.NetIO {
for _, v := range meta.NetIO {
nets = append(nets, NetC{
Time: v.Time,
BytesSent: format.FileSize(int64(v.BytesSent)), // 转换为最大整数单位
@@ -176,7 +178,7 @@ func (c *cMonitor) Trends(client *websocket.Client, req *websocket.WRequest) {
data = g.Map{
"head": monitorHeads,
"load": global.MonitorData.LoadAvg,
"load": meta.LoadAvg,
"net": nets,
}

2
server/internal/controller/websocket/handler/common/site.go
View File

@@ -1,6 +1,6 @@
// Package common
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2022 HotGo CLI
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//

8
server/internal/controller/websocket/send.go
View File

@@ -1,6 +1,6 @@
// Package websocket
// @Link https://github.com/bufanyun/hotgo
// @Copyright Copyright (c) 2022 HotGo CLI
// @Copyright Copyright (c) 2023 HotGo CLI
// @Author Ms <133814250@qq.com>
// @License https://github.com/bufanyun/hotgo/blob/master/LICENSE
//
@@ -8,7 +8,7 @@ package websocket
import (
"context"
"hotgo/internal/model/input/websocketin"
"hotgo/api/websocket/base"
"hotgo/internal/websocket"
"hotgo/utility/simple"
)
@@ -18,8 +18,8 @@ var Send = send{}
type send struct{}
// ToTag 发送标签消息
func (c *send) ToTag(ctx context.Context, req *websocketin.SendToTagReq) (res *websocketin.SendToTagRes, err error) {
// SendToTag 发送标签消息
func (c *send) SendToTag(ctx context.Context, req base.SendToTagReq) (res *base.SendToTagRes, err error) {
simple.SafeGo(ctx, func(ctx context.Context) {
websocket.SendToTag(req.Tag, &websocket.WResponse{
Event: req.Response.Event,