diff --git a/web/controller/api.go b/web/controller/api.go index 636035ba..32af934e 100644 --- a/web/controller/api.go +++ b/web/controller/api.go @@ -47,6 +47,7 @@ func (a *APIController) initRouter(g *gin.RouterGroup) { {"POST", "/resetAllClientTraffics/:id", a.inboundController.resetAllClientTraffics}, {"POST", "/delDepletedClients/:id", a.inboundController.delDepletedClients}, {"POST", "/onlines", a.inboundController.onlines}, + {"POST", "/lastOnline", a.inboundController.lastOnline}, {"POST", "/updateClientTraffic/:email", a.inboundController.updateClientTraffic}, } diff --git a/web/controller/inbound.go b/web/controller/inbound.go index 851b4b6f..9ff2f302 100644 --- a/web/controller/inbound.go +++ b/web/controller/inbound.go @@ -340,6 +340,11 @@ func (a *InboundController) onlines(c *gin.Context) { jsonObj(c, a.inboundService.GetOnlineClients(), nil) } +func (a *InboundController) lastOnline(c *gin.Context) { + data, err := a.inboundService.GetClientsLastOnline() + jsonObj(c, data, err) +} + func (a *InboundController) updateClientTraffic(c *gin.Context) { email := c.Param("email") diff --git a/web/service/inbound.go b/web/service/inbound.go index 0621cdea..b494d502 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -967,6 +967,7 @@ func (s *InboundService) addClientTraffic(tx *gorm.DB, traffics []*xray.ClientTr // Add user in onlineUsers array on traffic if traffics[traffic_index].Up+traffics[traffic_index].Down > 0 { onlineClients = append(onlineClients, traffics[traffic_index].Email) + dbClientTraffics[dbTraffic_index].LastOnline = time.Now().UnixMilli() } break } @@ -2187,6 +2188,20 @@ func (s *InboundService) GetOnlineClients() []string { return p.GetOnlineClients() } +func (s *InboundService) GetClientsLastOnline() (map[string]int64, error) { + db := database.GetDB() + var rows []xray.ClientTraffic + err := db.Model(&xray.ClientTraffic{}).Select("email, last_online").Find(&rows).Error + if err != nil && err != gorm.ErrRecordNotFound { + return nil, err + } + result := make(map[string]int64, len(rows)) + for _, r := range rows { + result[r.Email] = r.LastOnline + } + return result, nil +} + func (s *InboundService) FilterAndSortClientEmails(emails []string) ([]string, []string, error) { db := database.GetDB() diff --git a/xray/client_traffic.go b/xray/client_traffic.go index 883de2cc..fe527d55 100644 --- a/xray/client_traffic.go +++ b/xray/client_traffic.go @@ -11,4 +11,5 @@ type ClientTraffic struct { ExpiryTime int64 `json:"expiryTime" form:"expiryTime"` Total int64 `json:"total" form:"total"` Reset int `json:"reset" form:"reset" gorm:"default:0"` + LastOnline int64 `json:"lastOnline" form:"lastOnline" gorm:"default:0"` }