diff --git a/handler/node.go b/handler/node.go index 6153a33..03ad972 100644 --- a/handler/node.go +++ b/handler/node.go @@ -53,6 +53,7 @@ func (h *Handler) PullNodeHandle(n *panel.NodeInfo) error { ni.Limit.IPLimit = number.SelectBigger(ni.Limit.IPLimit, h.Limit.IPLimit) ni.Limit.SpeedLimit = number.SelectBigger(ni.Limit.SpeedLimit, uint64(h.Limit.SpeedLimit)) err := h.c.AddNode(&core.AddNodeParams{ + Name: h.nodeName, NodeInfo: ni, TlsOptions: core.TlsOptions{ CertPath: h.Cert.CertPath, diff --git a/handler/user.go b/handler/user.go index c53b05b..8e68cd6 100644 --- a/handler/user.go +++ b/handler/user.go @@ -80,8 +80,20 @@ func (h *Handler) ReportUserHandle(id int) error { if rsp.Up == 0 && rsp.Down == 0 { return false } + users = append(users, panel.UserTrafficInfo{ + Id: v.Id, + Name: v.Name, + Upload: rsp.Up, + Download: rsp.Down, + }) return false }) + if err != nil { + return fmt.Errorf("get user traffic error: %w", err) + } + if len(users) == 0 { + return nil + } err = h.p.ReportUserTraffic(&panel.ReportUserTrafficParams{ Id: id, Users: users,