Develop (#76)
* refactor: rename queryannouncementhandler.go to queryAnnouncementLogic.go for clarity
* feat(panDomain): update subscription logic to use V2 handler for improved functionality
* refactor(subscribe): replace V2 handler with a unified Handler method for subscription logic
* feat(subscribe): implement user agent limit feature with configurable list
* fix(subscribe): improve error handling and logging for subscription requests
* feat(subscribe): add user agent limit configuration to system settings
* refactor(api): remove deprecated application-related endpoints and types
* refactor(swagger): remove deprecated app.json generation from swagger configuration
* refactor(swagger): remove deprecated app.json check from swagger configuration
* fix(subscribe): update delete method to use Where clause for improved query accuracy
* fix(subscribe): update Id field tag to use primaryKey and improve save method query
* fix(subscribe): update Id field tag to use primaryKey and improve model queries
* fix(subscribe): rename variable for clarity and add special handling for Stash user agent
* fix(email): convert RegisterStartTime and RegisterEndTime to time.Time for accurate query filtering
* refactor(log): consolidate logging models and update related logic for improved clarity and functionality
* fix(types): change Content field type in MessageLog to interface{} for improved flexibility
* fix(log): change MessageLog list to use value type for improved performance and memory efficiency
* fix(email): set EmailTypeVerify in task payload and update content type conversion for verification email
* fix(log): remove unused Id field from SystemLog during login log insertion
* fix(login): remove debug logs and error logging during user login process
* fix(log): add traffic reset logging for subscription resets
* fix(log): insert reset traffic log during subscription activation
* feat(log): add endpoints for retrieving and resetting subscribe traffic logs
* refactor(log): remove Reset Subscribe Traffic Log endpoint and related types
* feat(traffic): add traffic statistics logging and scheduling
* fix(subscribe): ensure active status and reset timestamps during traffic resets
* feat(api): enhance server and node management with new request/response structures
* refactor(api): rename OnlineUser to ServerOnlineUser for clarity
* feat(api): define OnlineUser type with SID and IP fields
* feat(server): implement server management handlers and database schema
* feat(api): add traffic log details filtering and enhance traffic log structures
* feat(api): migrate server and node data handling, update related structures and logic
* feat(server): implement server deletion logic with error handling
* feat(api): update log filtering to use ResetSubscribe type for subscription logs
* feat(api): standardize timestamp field across log structures
* feat(api): refactor cache key handling for server and user lists
* feat(api): enhance server status handling with protocol support and refactor related logic
* fix(traffic): adjust start date for traffic statistics and improve log deletion comment
* feat(api): implement daily traffic ranking for users and servers with error handling
* feat(api): update server total data response to use 'OnlineUsers' and implement daily traffic statistics logging
* feat(api): add log settings management with auto-clear and clear days configuration
* fix(log): correct category in log settings update query
* feat(routes): add handler for scheduled traffic statistics
* feat(model): add user counts struct and update queries for new and renewal users
* feat(api): add referral percentage and only first purchase fields to user model and requests
* feat(database): update user table to add referral percentage and only first purchase fields
* feat(api): add reset sort endpoints for server and node
* feat(api): add sort field to server model
* feat(api): implement sorting functionality for nodes and servers
* fix(database): add sort column to nodes table
* fix(model): enhance user statistics queries with new order and renewal order counts
* fix(log): update timestamp handling in login and registration logs
* fix(log): update sorting logic for server and user subscribe traffic logs
* fix(server): add server status handling based on last reported time
* fix(model): correct filter condition to use 'date' instead of 'data'
* fix(migration): add index for traffic log on timestamp, user_id, and subscribe_id
* fix(log): optimize user traffic rank data handling by using append instead of index assignment
* fix(filter): refactor node list creation to use append and remove duplicates from tags
* fix(node): add ServerId and Enabled fields to node update logic
* feat(tags): add endpoint to query all node tags
* fix(preview): add Preload parameter to FilterNodeList for improved data retrieval
* fix(log): date is empty
* feat(subscribe): add Language field to subscription models and update query logic
* feat(subscription): add Language parameter to GetSubscription request and update query logic
* fix(server): encode ServerKey in base64 and update last reported time for nodes
* feat: delete common GetSubscription
* feat(subscription): implement FilterList method for subscription queries and update related logic
* fix(subscribe): remove duplicate user agents in SubscribeHandler
* fix(push): initialize onlineUsers as a map in pushOnlineUsersLogic
* fix(reset): initialize subs as a map in clearCache method
* refactor(query): simplify node and tag filtering using InSet function
* feat(userlist): enhance GetServerUserListLogic with improved node and tag handling
* fix(userlist): correct node ID assignment and update query logic for tag filtering
* fix(userlist): correct node ID assignment in getServerUserListLogic
* refactor(query): streamline query construction for tag filtering
* fix(statistics): optimize server ranking data handling in QueryServerTotalDataLogic
* refactor(statistics): simplify server ranking data construction in QueryServerTotalDataLogic
* fix(statistics): correct server traffic data assignment in QueryServerTotalDataLogic
* fix(statistics): optimize yesterday's top 10 server traffic data assignment in QueryServerTotalDataLogic
* fix(middleware): remove duplicate elements from user agent list in PanDomainMiddleware
* feat(middleware): enhance user agent handling by querying client list in PanDomainMiddleware
* feat(client): subscribe_template
* feat(oauth): add user agent and IP logging to registration and login processes
* fix(balance): add timestamp to balance logs for payment, refund, and recharge transactions
* fix(log): correct comment for CommissionTypeRefund to improve clarity
* fix(log): replace magic number with constant for gift type in purchase checkout logic
* fix(log): rename OrderId to OrderNo for consistency in balance logging
* feat(log): add logging for balance, gift amount, and commission adjustments
* fix(user): correct placement of DeepCopy for user info update logic
* feat(log): add UserSubscribeId to FilterSubscribeLogRequest for enhanced filtering
* fix(purchase): streamline error handling and improve JSON marshaling for temporary orders
* fix(order): simplify commission handling and improve payload parsing logic
* fix(order): update commission calculation to actual payment amount minus gateway handling fee
* feat(payment): add support for CryptoSaaS payment platform and enhance configuration handling
* fix(balance): update QueryUserBalanceLog response structure to include balance log list
* fix(email): update task progress handling to use specific task ID for updates
* feat(quota): add quota task creation and querying endpoints with updated data structures
* fix(email): update task handling to use generic task model and improve error logging
* fix(order): improve error logging for database transaction and user cache updates
* feat(quota): enhance quota task management with new request structures and processing logic
* fix(quota): remove redundant quota task status endpoint from admin marketing routes
* fix(worker): update task completion status handling in worker logic
* fix(quota): update taskInfo to include current subscription count in quota logic
* doc(log): rename function for clarity and add cache cleanup comment
* fix(quota): update time handling in quota logic and correct subscriber ID query
* fix(quota): update time handling to use UnixMilli for start time in quota logic
* feat(protocol): add server protocol configuration query and enhance protocol options
* fix(quota): correct time range queries for start and expire times in quota logic
* fix(types): update plugin options to include 'none' in the plugin field
---------
Co-authored-by: Chang lue Tsen <tension@ppanel.dev>
This commit is contained in:
@@ -8,10 +8,13 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/log"
|
||||
"github.com/perfect-panel/server/internal/model/node"
|
||||
"github.com/perfect-panel/server/internal/model/subscribe"
|
||||
"github.com/perfect-panel/server/internal/model/user"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/tool"
|
||||
"github.com/perfect-panel/server/queue/types"
|
||||
|
||||
"github.com/hibiken/asynq"
|
||||
@@ -116,13 +119,6 @@ func (l *ResetTrafficLogic) ProcessTask(ctx context.Context, _ *asynq.Task) erro
|
||||
}
|
||||
}()
|
||||
|
||||
// Reset today's traffic data
|
||||
err = l.svc.NodeCache.ResetTodayTrafficData(ctx)
|
||||
if err != nil {
|
||||
logger.Errorw("[ResetTodayTraffic] Failed to reset today traffic data",
|
||||
logger.Field("error", err.Error()))
|
||||
}
|
||||
|
||||
// Load last reset time from cache
|
||||
var cache resetTrafficCache
|
||||
cacheData, err := l.svc.Redis.Get(ctx, cacheKey).Result()
|
||||
@@ -237,8 +233,10 @@ func (l *ResetTrafficLogic) resetMonth(ctx context.Context) error {
|
||||
|
||||
err = db.Model(&user.Subscribe{}).Where("`id` IN ?", monthlyResetUsers).
|
||||
Updates(map[string]interface{}{
|
||||
"upload": 0,
|
||||
"download": 0,
|
||||
"upload": 0,
|
||||
"download": 0,
|
||||
"status": 1, // Ensure status is active
|
||||
"finished_at": nil,
|
||||
}).Error
|
||||
if err != nil {
|
||||
logger.Errorw("[ResetTraffic] Failed to update monthly reset users", logger.Field("error", err.Error()))
|
||||
@@ -252,16 +250,7 @@ func (l *ResetTrafficLogic) resetMonth(ctx context.Context) error {
|
||||
return err
|
||||
}
|
||||
// Clear cache for these subscriptions
|
||||
for _, sub := range userSubs {
|
||||
if sub.SubscribeId > 0 {
|
||||
err = l.svc.UserModel.ClearSubscribeCache(ctx, sub)
|
||||
if err != nil {
|
||||
logger.Errorw("[ResetTraffic] Failed to clear cache for subscription",
|
||||
logger.Field("subscribeId", sub.SubscribeId),
|
||||
logger.Field("error", err.Error()))
|
||||
}
|
||||
}
|
||||
}
|
||||
l.clearCache(ctx, userSubs)
|
||||
logger.Infow("[ResetTraffic] Monthly reset completed", logger.Field("count", len(monthlyResetUsers)))
|
||||
} else {
|
||||
logger.Infow("[ResetTraffic] No users found for monthly reset")
|
||||
@@ -329,8 +318,10 @@ func (l *ResetTrafficLogic) reset1st(ctx context.Context, cache resetTrafficCach
|
||||
// Reset upload and download traffic to zero
|
||||
err = db.Model(&user.Subscribe{}).Where("`id` IN ?", users1stReset).
|
||||
Updates(map[string]interface{}{
|
||||
"upload": 0,
|
||||
"download": 0,
|
||||
"upload": 0,
|
||||
"download": 0,
|
||||
"status": 1, // Ensure status is active
|
||||
"finished_at": nil,
|
||||
}).Error
|
||||
if err != nil {
|
||||
logger.Errorw("[ResetTraffic] Failed to update 1st reset users", logger.Field("error", err.Error()))
|
||||
@@ -344,17 +335,7 @@ func (l *ResetTrafficLogic) reset1st(ctx context.Context, cache resetTrafficCach
|
||||
}
|
||||
|
||||
// Clear cache for these subscriptions
|
||||
for _, sub := range userSubs {
|
||||
if sub.SubscribeId > 0 {
|
||||
err = l.svc.UserModel.ClearSubscribeCache(ctx, sub)
|
||||
if err != nil {
|
||||
logger.Errorw("[ResetTraffic] Failed to clear cache for subscription",
|
||||
logger.Field("subscribeId", sub.SubscribeId),
|
||||
logger.Field("error", err.Error()))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
l.clearCache(ctx, userSubs)
|
||||
logger.Infow("[ResetTraffic] 1st reset completed", logger.Field("count", len(users1stReset)))
|
||||
} else {
|
||||
logger.Infow("[ResetTraffic] No users found for 1st reset")
|
||||
@@ -423,8 +404,10 @@ func (l *ResetTrafficLogic) resetYear(ctx context.Context) error {
|
||||
// Reset upload and download traffic to zero
|
||||
err = db.Model(&user.Subscribe{}).Where("`id` IN ?", usersYearReset).
|
||||
Updates(map[string]interface{}{
|
||||
"upload": 0,
|
||||
"download": 0,
|
||||
"upload": 0,
|
||||
"download": 0,
|
||||
"status": 1, // Ensure status is active
|
||||
"finished_at": nil,
|
||||
}).Error
|
||||
if err != nil {
|
||||
logger.Errorw("[ResetTraffic] Failed to update yearly reset users", logger.Field("error", err.Error()))
|
||||
@@ -438,16 +421,7 @@ func (l *ResetTrafficLogic) resetYear(ctx context.Context) error {
|
||||
return err
|
||||
}
|
||||
// Clear cache for these subscriptions
|
||||
for _, sub := range userSubs {
|
||||
if sub.SubscribeId > 0 {
|
||||
err = l.svc.UserModel.ClearSubscribeCache(ctx, sub)
|
||||
if err != nil {
|
||||
logger.Errorw("[ResetTraffic] Failed to clear cache for subscription",
|
||||
logger.Field("subscribeId", sub.SubscribeId),
|
||||
logger.Field("error", err.Error()))
|
||||
}
|
||||
}
|
||||
}
|
||||
l.clearCache(ctx, userSubs)
|
||||
logger.Infow("[ResetTraffic] Yearly reset completed", logger.Field("count", len(usersYearReset)))
|
||||
} else {
|
||||
logger.Infow("[ResetTraffic] No users found for yearly reset")
|
||||
@@ -601,3 +575,73 @@ func (l *ResetTrafficLogic) isRetryableError(err error) bool {
|
||||
logger.Field("error", err.Error()))
|
||||
return true
|
||||
}
|
||||
|
||||
// clearCache clears the reset traffic cache
|
||||
func (l *ResetTrafficLogic) clearCache(ctx context.Context, list []*user.Subscribe) {
|
||||
if len(list) != 0 {
|
||||
subs := make(map[int64]bool)
|
||||
|
||||
for _, sub := range list {
|
||||
if sub.SubscribeId > 0 {
|
||||
err := l.svc.UserModel.ClearSubscribeCache(ctx, sub)
|
||||
if err != nil {
|
||||
logger.Errorw("[ResetTraffic] Failed to clear cache for subscription",
|
||||
logger.Field("subscribeId", sub.SubscribeId),
|
||||
logger.Field("error", err.Error()))
|
||||
}
|
||||
if _, ok := subs[sub.SubscribeId]; !ok {
|
||||
subs[sub.SubscribeId] = true
|
||||
}
|
||||
}
|
||||
// Insert traffic reset log
|
||||
l.insertLog(ctx, sub.Id, sub.UserId)
|
||||
}
|
||||
|
||||
for sub, _ := range subs {
|
||||
info, err := l.svc.SubscribeModel.FindOne(ctx, sub)
|
||||
if err != nil {
|
||||
logger.Errorw("[CheckSubscription] FindOne subscribe failed", logger.Field("error", err.Error()), logger.Field("subscribe_id", sub))
|
||||
continue
|
||||
}
|
||||
if info != nil && info.Id == sub {
|
||||
var nodes []int64
|
||||
if info.Nodes != "" {
|
||||
nodes = tool.StringToInt64Slice(info.Nodes)
|
||||
}
|
||||
var tag []string
|
||||
if info.NodeTags != "" {
|
||||
tag = strings.Split(info.NodeTags, ",")
|
||||
}
|
||||
|
||||
err = l.svc.NodeModel.ClearNodeCache(ctx, &node.FilterNodeParams{
|
||||
Page: 1,
|
||||
Size: 1000,
|
||||
Tag: tag,
|
||||
ServerId: nodes,
|
||||
})
|
||||
if err != nil {
|
||||
logger.Errorw("[CheckSubscription] ClearNodeCache failed", logger.Field("error", err.Error()), logger.Field("subscribe_id", sub))
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// insertLog inserts a reset traffic log entry
|
||||
func (l *ResetTrafficLogic) insertLog(ctx context.Context, subId, userId int64) {
|
||||
trafficLog := log.ResetSubscribe{
|
||||
Type: log.ResetSubscribeTypeAuto,
|
||||
UserId: userId,
|
||||
Timestamp: time.Now().UnixMilli(),
|
||||
}
|
||||
content, _ := trafficLog.Marshal()
|
||||
if err := l.svc.DB.WithContext(ctx).Model(&log.SystemLog{}).Create(&log.SystemLog{
|
||||
Type: log.TypeResetSubscribe.Uint8(),
|
||||
ObjectID: subId,
|
||||
Date: time.Now().Format(time.DateOnly),
|
||||
Content: string(content),
|
||||
}).Error; err != nil {
|
||||
logger.Errorw("[ResetTraffic] Failed to create system log for subscription", logger.Field("error", err.Error()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ func (l *ServerDataLogic) getRanking(ctx context.Context) (top10ServerToday, top
|
||||
if s.ServerId == 0 {
|
||||
continue
|
||||
}
|
||||
serverInfo, err := l.svc.ServerModel.FindOne(ctx, s.ServerId)
|
||||
serverInfo, err := l.svc.NodeModel.FindOneServer(ctx, s.ServerId)
|
||||
if err != nil {
|
||||
logger.Error("[ServerDataLogic] Find server failed", logger.Field("error", err.Error()))
|
||||
continue
|
||||
@@ -92,7 +92,7 @@ func (l *ServerDataLogic) getRanking(ctx context.Context) (top10ServerToday, top
|
||||
logger.Error("[ServerDataLogic] Get top servers traffic by day failed", logger.Field("error", err.Error()))
|
||||
} else {
|
||||
for _, s := range serverYesterday {
|
||||
serverInfo, err := l.svc.ServerModel.FindOne(ctx, s.ServerId)
|
||||
serverInfo, err := l.svc.NodeModel.FindOneServer(ctx, s.ServerId)
|
||||
if err != nil {
|
||||
logger.Error("[ServerDataLogic] Find server failed", logger.Field("error", err.Error()))
|
||||
continue
|
||||
|
||||
@@ -0,0 +1,176 @@
|
||||
package traffic
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/hibiken/asynq"
|
||||
"github.com/perfect-panel/server/internal/model/log"
|
||||
"github.com/perfect-panel/server/internal/model/traffic"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
)
|
||||
|
||||
type StatLogic struct {
|
||||
svc *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewStatLogic(svc *svc.ServiceContext) *StatLogic {
|
||||
return &StatLogic{
|
||||
svc: svc,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *StatLogic) ProcessTask(ctx context.Context, _ *asynq.Task) error {
|
||||
now := time.Now()
|
||||
tx := l.svc.DB.Begin()
|
||||
var err error
|
||||
defer func(err error) {
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Process task failed: %v", err.Error())
|
||||
tx.Rollback()
|
||||
} else {
|
||||
logger.Infof("[Traffic Stat Queue] Process task completed successfully, consuming: %s", time.Since(now).String())
|
||||
// 提交事务
|
||||
if err = tx.Commit().Error; err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Commit transaction failed: %v", err.Error())
|
||||
}
|
||||
}
|
||||
}(err)
|
||||
|
||||
// 获取全部有效订阅
|
||||
var userTraffic []log.UserTraffic
|
||||
// 获取统计时间范围
|
||||
start := time.Date(now.Year(), now.Month(), now.Day()-1, 0, 0, 0, 0, time.Local)
|
||||
end := start.Add(24 * time.Hour).Add(-time.Nanosecond)
|
||||
|
||||
// 查询用户流量统计, 按用户和订阅分组
|
||||
err = tx.WithContext(ctx).Model(&traffic.TrafficLog{}).
|
||||
Select("user_id, subscribe_id, SUM(download + upload) AS total, SUM(download) AS download, SUM(upload) AS upload").
|
||||
Where("timestamp BETWEEN ? AND ?", start, end).
|
||||
Group("user_id, subscribe_id").
|
||||
Order("total DESC").
|
||||
Scan(&userTraffic).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Query user traffic failed: %v", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
date := start.Format(time.DateOnly)
|
||||
|
||||
userTop10 := log.UserTrafficRank{
|
||||
Rank: make(map[uint8]log.UserTraffic),
|
||||
}
|
||||
|
||||
// 更新用户流量统计
|
||||
for i, trafficData := range userTraffic {
|
||||
if i < 10 {
|
||||
userTop10.Rank[uint8(i+1)] = trafficData
|
||||
}
|
||||
// 更新用户流量统计日志
|
||||
content, _ := trafficData.Marshal()
|
||||
err = tx.WithContext(ctx).Model(&log.SystemLog{}).Create(&log.SystemLog{
|
||||
Type: log.TypeSubscribeTraffic.Uint8(),
|
||||
Date: date,
|
||||
ObjectID: trafficData.SubscribeId,
|
||||
Content: string(content),
|
||||
}).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Create user traffic log failed: %v", err.Error())
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
userTop10Content, _ := userTop10.Marshal()
|
||||
|
||||
// 更新用户排行榜
|
||||
err = tx.WithContext(ctx).Model(&log.SystemLog{}).Create(&log.SystemLog{
|
||||
Type: log.TypeUserTrafficRank.Uint8(),
|
||||
Date: date,
|
||||
ObjectID: 0, // 0表示全局用户排行榜
|
||||
Content: string(userTop10Content),
|
||||
}).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Create user traffic rank log failed: %v", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
// 统计服务器流量
|
||||
var serverTraffic []log.ServerTraffic
|
||||
err = tx.WithContext(ctx).Model(&traffic.TrafficLog{}).
|
||||
Select("server_id, SUM(download + upload) AS total, SUM(download) AS download, SUM(upload) AS upload").
|
||||
Where("timestamp BETWEEN ? AND ?", start, end).
|
||||
Group("server_id").
|
||||
Order("total DESC").
|
||||
Scan(&serverTraffic).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Query server traffic failed: %v", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
serverTop10 := log.ServerTrafficRank{
|
||||
Rank: make(map[uint8]log.ServerTraffic),
|
||||
}
|
||||
for i, trafficData := range serverTraffic {
|
||||
if i < 10 {
|
||||
serverTop10.Rank[uint8(i+1)] = trafficData
|
||||
}
|
||||
// 更新服务器流量统计日志
|
||||
content, _ := trafficData.Marshal()
|
||||
err = tx.WithContext(ctx).Model(&log.SystemLog{}).Create(&log.SystemLog{
|
||||
Type: log.TypeServerTraffic.Uint8(),
|
||||
Date: date,
|
||||
ObjectID: trafficData.ServerId,
|
||||
Content: string(content),
|
||||
}).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Create server traffic log failed: %v", err.Error())
|
||||
return err
|
||||
}
|
||||
}
|
||||
serverTop10Content, _ := serverTop10.Marshal()
|
||||
// 更新服务器排行榜
|
||||
err = tx.WithContext(ctx).Model(&log.SystemLog{}).Create(&log.SystemLog{
|
||||
Type: log.TypeServerTrafficRank.Uint8(),
|
||||
Date: date,
|
||||
ObjectID: 0, // 0表示全局服务器排行榜
|
||||
Content: string(serverTop10Content),
|
||||
}).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Create server traffic rank log failed: %v", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
// traffic stat
|
||||
var stat log.TrafficStat
|
||||
err = tx.WithContext(ctx).Model(&traffic.TrafficLog{}).
|
||||
Select("SUM(download + upload) AS total, SUM(download) AS download, SUM(upload) AS upload").
|
||||
Where("timestamp BETWEEN ? AND ?", start, end).
|
||||
Scan(&stat).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Query traffic stat failed: %v", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
// 更新流量统计日志
|
||||
content, _ := stat.Marshal()
|
||||
err = tx.WithContext(ctx).Model(&log.SystemLog{}).Create(&log.SystemLog{
|
||||
Type: log.TypeTrafficStat.Uint8(),
|
||||
Date: date,
|
||||
ObjectID: 0,
|
||||
Content: string(content),
|
||||
}).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Create traffic stat log failed: %v", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
// Delete old traffic logs
|
||||
if l.svc.Config.Log.AutoClear {
|
||||
err = tx.WithContext(ctx).Model(&traffic.TrafficLog{}).Where("created_at <= ?", end.AddDate(0, 0, int(-l.svc.Config.Log.ClearDays))).Delete(&traffic.TrafficLog{}).Error
|
||||
if err != nil {
|
||||
logger.Errorf("[Traffic Stat Queue] Delete server traffic log failed: %v", err.Error())
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -38,7 +38,7 @@ func (l *TrafficStatisticsLogic) ProcessTask(ctx context.Context, task *asynq.Ta
|
||||
return nil
|
||||
}
|
||||
// query server info
|
||||
serverInfo, err := l.svc.ServerModel.FindOne(ctx, payload.ServerId)
|
||||
serverInfo, err := l.svc.NodeModel.FindOneServer(ctx, payload.ServerId)
|
||||
if err != nil {
|
||||
logger.WithContext(ctx).Error("[TrafficStatistics] Find server info failed",
|
||||
logger.Field("serverId", payload.ServerId),
|
||||
@@ -46,23 +46,22 @@ func (l *TrafficStatisticsLogic) ProcessTask(ctx context.Context, task *asynq.Ta
|
||||
)
|
||||
return nil
|
||||
}
|
||||
if serverInfo.TrafficRatio == 0 {
|
||||
logger.WithContext(ctx).Error("[TrafficStatistics] Server log ratio is 0",
|
||||
logger.Field("serverId", payload.ServerId),
|
||||
)
|
||||
return nil
|
||||
var serverRatio float32 = 1.0
|
||||
if serverInfo.Ratio > 0 {
|
||||
serverRatio = serverInfo.Ratio
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
realTimeMultiplier := l.svc.NodeMultiplierManager.GetMultiplier(now)
|
||||
for _, log := range payload.Logs {
|
||||
// update user subscribe with log
|
||||
d := int64(float32(log.Download) * serverInfo.TrafficRatio * realTimeMultiplier)
|
||||
u := int64(float32(log.Upload) * serverInfo.TrafficRatio * realTimeMultiplier)
|
||||
d := int64(float32(log.Download) * serverRatio * realTimeMultiplier)
|
||||
u := int64(float32(log.Upload) * serverRatio * realTimeMultiplier)
|
||||
if err := l.svc.UserModel.UpdateUserSubscribeWithTraffic(ctx, log.SID, d, u); err != nil {
|
||||
logger.WithContext(ctx).Error("[TrafficStatistics] Update user subscribe with log failed",
|
||||
logger.Field("sid", log.SID),
|
||||
logger.Field("download", float32(log.Download)*serverInfo.TrafficRatio),
|
||||
logger.Field("upload", float32(log.Upload)*serverInfo.TrafficRatio),
|
||||
logger.Field("download", float32(log.Download)*serverRatio),
|
||||
logger.Field("upload", float32(log.Upload)*serverRatio),
|
||||
logger.Field("error", err.Error()),
|
||||
)
|
||||
continue
|
||||
@@ -88,8 +87,8 @@ func (l *TrafficStatisticsLogic) ProcessTask(ctx context.Context, task *asynq.Ta
|
||||
}); err != nil {
|
||||
logger.WithContext(ctx).Error("[TrafficStatistics] Create log log failed",
|
||||
logger.Field("uid", log.SID),
|
||||
logger.Field("download", float32(log.Download)*serverInfo.TrafficRatio),
|
||||
logger.Field("upload", float32(log.Upload)*serverInfo.TrafficRatio),
|
||||
logger.Field("download", float32(log.Download)*serverRatio),
|
||||
logger.Field("upload", float32(log.Upload)*serverRatio),
|
||||
logger.Field("error", err.Error()),
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user