refactor: 更新项目引用路径从perfect-panel/ppanel-server到perfect-panel/server
Build docker and publish / build (20.15.1) (push) Failing after 6m27s

feat: 添加版本和构建时间变量
fix: 修正短信队列类型注释错误
style: 清理未使用的代码和测试文件
docs: 更新安装文档中的下载链接
chore: 迁移数据库脚本添加日志和订阅配置
This commit is contained in:
2025-10-13 01:33:03 -07:00
parent 393b42f35a
commit c582087c0f
974 changed files with 23609 additions and 23398 deletions
@@ -2,12 +2,14 @@ package console
import (
"context"
"os"
"strings"
"time"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/ppanel-server/pkg/xerr"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
)
@@ -17,7 +19,7 @@ type QueryRevenueStatisticsLogic struct {
svcCtx *svc.ServiceContext
}
// Query revenue statistics
// NewQueryRevenueStatisticsLogic Query revenue statistics
func NewQueryRevenueStatisticsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *QueryRevenueStatisticsLogic {
return &QueryRevenueStatisticsLogic{
Logger: logger.WithContext(ctx),
@@ -27,6 +29,9 @@ func NewQueryRevenueStatisticsLogic(ctx context.Context, svcCtx *svc.ServiceCont
}
func (l *QueryRevenueStatisticsLogic) QueryRevenueStatistics() (resp *types.RevenueStatisticsResponse, err error) {
if strings.ToLower(os.Getenv("PPANEL_MODE")) == "demo" {
return l.mockRevenueStatistics(), nil
}
var today, monthly, all types.OrdersStatistics
now := time.Now()
@@ -45,8 +50,8 @@ func (l *QueryRevenueStatisticsLogic) QueryRevenueStatistics() (resp *types.Reve
// Get monthly's revenue statistics
monthlyData, err := l.svcCtx.OrderModel.QueryMonthlyOrders(l.ctx, now)
if err != nil {
l.Errorw("[QueryRevenueStatisticsLogic] QueryDateOrders error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryDateOrders error: %v", err)
l.Errorw("[QueryRevenueStatisticsLogic] QueryMonthlyOrders error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryMonthlyOrders error: %v", err)
} else {
monthly = types.OrdersStatistics{
AmountTotal: monthlyData.AmountTotal,
@@ -56,6 +61,24 @@ func (l *QueryRevenueStatisticsLogic) QueryRevenueStatistics() (resp *types.Reve
}
}
// Get monthly daily list for the current month (from 1st to current date)
monthlyListData, err := l.svcCtx.OrderModel.QueryDailyOrdersList(l.ctx, now)
if err != nil {
l.Errorw("[QueryRevenueStatisticsLogic] QueryDailyOrdersList error", logger.Field("error", err.Error()))
// Don't return error, just log it and continue with empty list
} else {
monthlyList := make([]types.OrdersStatistics, len(monthlyListData))
for i, data := range monthlyListData {
monthlyList[i] = types.OrdersStatistics{
Date: data.Date,
AmountTotal: data.AmountTotal,
NewOrderAmount: data.NewOrderAmount,
RenewalOrderAmount: data.RenewalOrderAmount,
}
}
monthly.List = monthlyList
}
// Get all revenue statistics
allData, err := l.svcCtx.OrderModel.QueryTotalOrders(l.ctx)
if err != nil {
@@ -69,9 +92,79 @@ func (l *QueryRevenueStatisticsLogic) QueryRevenueStatistics() (resp *types.Reve
List: make([]types.OrdersStatistics, 0),
}
}
// Get all monthly list for the past 6 months
allListData, err := l.svcCtx.OrderModel.QueryMonthlyOrdersList(l.ctx, now)
if err != nil {
l.Errorw("[QueryRevenueStatisticsLogic] QueryMonthlyOrdersList error", logger.Field("error", err.Error()))
// Don't return error, just log it and continue with empty list
} else {
allList := make([]types.OrdersStatistics, len(allListData))
for i, data := range allListData {
allList[i] = types.OrdersStatistics{
Date: data.Date,
AmountTotal: data.AmountTotal,
NewOrderAmount: data.NewOrderAmount,
RenewalOrderAmount: data.RenewalOrderAmount,
}
}
all.List = allList
}
return &types.RevenueStatisticsResponse{
Today: today,
Monthly: monthly,
All: all,
}, nil
}
// mockRevenueStatistics is a mock function to simulate revenue statistics data.
func (l *QueryRevenueStatisticsLogic) mockRevenueStatistics() *types.RevenueStatisticsResponse {
now := time.Now()
// Generate daily data for the current month (from 1st to current date)
monthlyList := make([]types.OrdersStatistics, 7)
for i := 0; i < 7; i++ {
dayDate := now.AddDate(0, 0, -(6 - i))
baseAmount := int64(25000 + ((6 - i) * 3000) + ((6-i)%3)*8000)
monthlyList[i] = types.OrdersStatistics{
Date: dayDate.Format("2006-01-02"),
AmountTotal: baseAmount,
NewOrderAmount: int64(float64(baseAmount) * 0.68),
RenewalOrderAmount: int64(float64(baseAmount) * 0.32),
}
}
// Generate monthly data for the past 6 months (oldest first)
allList := make([]types.OrdersStatistics, 6)
for i := 0; i < 6; i++ {
monthDate := now.AddDate(0, -(5 - i), 0)
baseAmount := int64(1800000 + ((5 - i) * 200000) + ((5-i)%2)*500000)
allList[i] = types.OrdersStatistics{
Date: monthDate.Format("2006-01"),
AmountTotal: baseAmount,
NewOrderAmount: int64(float64(baseAmount) * 0.68),
RenewalOrderAmount: int64(float64(baseAmount) * 0.32),
}
}
return &types.RevenueStatisticsResponse{
Today: types.OrdersStatistics{
AmountTotal: 35888,
NewOrderAmount: 22888,
RenewalOrderAmount: 13000,
},
Monthly: types.OrdersStatistics{
AmountTotal: 888888,
NewOrderAmount: 588888,
RenewalOrderAmount: 300000,
List: monthlyList,
},
All: types.OrdersStatistics{
AmountTotal: 12888888,
NewOrderAmount: 8588888,
RenewalOrderAmount: 4300000,
List: allList,
},
}
}
@@ -2,11 +2,19 @@ package console
import (
"context"
"os"
"strings"
"time"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/server/internal/model/log"
"github.com/perfect-panel/server/internal/model/node"
"github.com/perfect-panel/server/internal/model/traffic"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
"gorm.io/gorm"
)
type QueryServerTotalDataLogic struct {
@@ -25,116 +33,269 @@ func NewQueryServerTotalDataLogic(ctx context.Context, svcCtx *svc.ServiceContex
}
func (l *QueryServerTotalDataLogic) QueryServerTotalData() (resp *types.ServerTotalDataResponse, err error) {
resp = &types.ServerTotalDataResponse{
ServerTrafficRankingToday: make([]types.ServerTrafficData, 0),
ServerTrafficRankingYesterday: make([]types.ServerTrafficData, 0),
UserTrafficRankingToday: make([]types.UserTrafficData, 0),
UserTrafficRankingYesterday: make([]types.UserTrafficData, 0),
if strings.ToLower(os.Getenv("PPANEL_MODE")) == "demo" {
return l.mockRevenueStatistics(), nil
}
// Query node server status
servers, err := l.svcCtx.ServerModel.FindAllServer(l.ctx)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] FindAllServer error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(err, "FindAllServer error: %v", err)
}
onlineServers, err := l.svcCtx.NodeCache.GetOnlineNodeStatusCount(l.ctx)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] GetOnlineNodeStatusCount error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(err, "GetOnlineNodeStatusCount error: %v", err)
}
resp.OnlineServers = onlineServers
resp.OfflineServers = int64(len(servers) - int(onlineServers))
now := time.Now()
// 获取所有节点在线用户
allNodeOnlineUser, err := l.svcCtx.NodeCache.GetAllNodeOnlineUser(l.ctx)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Get all node online user failed", logger.Field("error", err.Error()))
}
resp.OnlineUserIPs = int64(len(allNodeOnlineUser))
todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
todayEnd := todayStart.Add(24 * time.Hour).Add(-time.Second)
query := l.svcCtx.DB.WithContext(l.ctx)
var todayTop10User []log.UserTraffic
// 获取所有节点今日上传下载流量
allNodeUploadTraffic, err := l.svcCtx.NodeCache.GetAllNodeUploadTraffic(l.ctx)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Get all node upload traffic failed", logger.Field("error", err.Error()))
err = query.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 ?", todayStart, todayEnd).
Group("user_id, subscribe_id").
Order("total DESC").
Limit(10).
Scan(&todayTop10User).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
logger.Errorf("[Traffic Stat Queue] Query user traffic failed: %v", err.Error())
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), " Query user traffic failed: %v", err.Error())
}
resp.TodayUpload = allNodeUploadTraffic
allNodeDownloadTraffic, err := l.svcCtx.NodeCache.GetAllNodeDownloadTraffic(l.ctx)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Get all node download traffic failed", logger.Field("error", err.Error()))
var userTodayTrafficRanking []types.UserTrafficData
for _, item := range todayTop10User {
userTodayTrafficRanking = append(userTodayTrafficRanking, types.UserTrafficData{
SID: item.SubscribeId,
Upload: item.Upload,
Download: item.Download,
})
}
resp.TodayDownload = allNodeDownloadTraffic
// 获取节点流量排行榜 前10
nodeTrafficRankingToday, err := l.svcCtx.NodeCache.GetNodeTodayTotalTrafficRank(l.ctx, 10)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Get node today total traffic rank failed", logger.Field("error", err.Error()))
// query yesterday user traffic rank log
yesterday := todayStart.Add(-24 * time.Hour).Format(time.DateOnly)
var yesterdayLog log.SystemLog
err = query.Model(&log.SystemLog{}).Where("`date` = ? AND `type` = ?", yesterday, log.TypeUserTrafficRank).First(&yesterdayLog).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Query yesterday user traffic rank log error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query yesterday user traffic rank log error: %v", err)
}
if len(nodeTrafficRankingToday) > 0 {
var serverTrafficData []types.ServerTrafficData
for _, rank := range nodeTrafficRankingToday {
serverInfo, err := l.svcCtx.ServerModel.FindOne(l.ctx, rank.ID)
var yesterdayUserRankData []types.UserTrafficData
if yesterdayLog.Id > 0 {
var rank log.UserTrafficRank
err = rank.Unmarshal([]byte(yesterdayLog.Content))
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Unmarshal yesterday user traffic rank log error", logger.Field("error", err.Error()))
}
for _, v := range rank.Rank {
yesterdayUserRankData = append(yesterdayUserRankData, types.UserTrafficData{
SID: v.SubscribeId,
Upload: v.Upload,
Download: v.Download,
})
}
}
// query server traffic rank today
var todayTop10Server []log.ServerTraffic
err = query.Model(&traffic.TrafficLog{}).Select("server_id, SUM(download + upload) AS total, SUM(download) AS download, SUM(upload) AS upload").
Where("timestamp BETWEEN ? AND ?", todayStart, todayEnd).
Group("server_id").
Order("total DESC").
Limit(10).
Scan(&todayTop10Server).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
logger.Errorf("[Traffic Stat Queue] Query server traffic failed: %v", err.Error())
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), " Query server traffic failed: %v", err.Error())
}
var todayServerRanking []types.ServerTrafficData
for _, item := range todayTop10Server {
info, err := l.svcCtx.NodeModel.FindOneServer(l.ctx, item.ServerId)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] FindOneServer error", logger.Field("error", err.Error()), logger.Field("server_id", item.ServerId))
continue
}
todayServerRanking = append(todayServerRanking, types.ServerTrafficData{
ServerId: item.ServerId,
Name: info.Name,
Upload: item.Upload,
Download: item.Download,
})
}
// query server traffic rank yesterday
var yesterdayTop10Server []types.ServerTrafficData
var yesterdayServerTrafficLog log.SystemLog
err = query.Model(&log.SystemLog{}).Where("`date` = ? AND `type` = ?", yesterday, log.TypeServerTrafficRank).First(&yesterdayServerTrafficLog).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Query yesterday server traffic rank log error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query yesterday server traffic rank log error: %v", err)
}
if yesterdayServerTrafficLog.Id > 0 {
var rank log.ServerTrafficRank
err = rank.Unmarshal([]byte(yesterdayServerTrafficLog.Content))
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Unmarshal yesterday server traffic rank log error", logger.Field("error", err.Error()))
}
for _, v := range rank.Rank {
info, err := l.svcCtx.NodeModel.FindOneServer(l.ctx, v.ServerId)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] FindOne error", logger.Field("error", err))
l.Errorw("[QueryServerTotalDataLogic] FindOneServer error", logger.Field("error", err.Error()), logger.Field("server_id", v.ServerId))
continue
}
serverTrafficData = append(serverTrafficData, types.ServerTrafficData{
ServerId: rank.ID,
Name: serverInfo.Name,
Upload: rank.Upload,
Download: rank.Download,
yesterdayTop10Server = append(yesterdayTop10Server, types.ServerTrafficData{
ServerId: v.ServerId,
Name: info.Name,
Upload: v.Upload,
Download: v.Download,
})
}
resp.ServerTrafficRankingToday = serverTrafficData
}
// 获取用户流量排行榜 前10
userTrafficRankingToday, err := l.svcCtx.NodeCache.GetUserTodayTotalTrafficRank(l.ctx, 10)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Get user today total traffic rank failed", logger.Field("error", err.Error()))
}
if len(userTrafficRankingToday) > 0 {
var userTrafficData []types.UserTrafficData
for _, rank := range userTrafficRankingToday {
userTrafficData = append(userTrafficData, types.UserTrafficData{
SID: rank.SID,
Upload: rank.Upload,
Download: rank.Download,
})
}
resp.UserTrafficRankingToday = userTrafficData
}
// 获取昨日节点流量排行榜 前10
nodeTrafficRankingYesterday, err := l.svcCtx.NodeCache.GetYesterdayNodeTotalTrafficRank(l.ctx)
// query online user count
onlineUsers, err := l.svcCtx.NodeModel.OnlineUserSubscribeGlobal(l.ctx)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Get yesterday node total traffic rank failed", logger.Field("error", err.Error()))
l.Errorw("[QueryServerTotalDataLogic] OnlineUserSubscribeGlobal error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "OnlineUserSubscribeGlobal error: %v", err)
}
if len(nodeTrafficRankingYesterday) > 0 {
var serverTrafficData []types.ServerTrafficData
for _, rank := range nodeTrafficRankingYesterday {
serverTrafficData = append(serverTrafficData, types.ServerTrafficData{
ServerId: rank.ID,
Name: rank.Name,
Upload: rank.Upload,
Download: rank.Download,
})
// query online/offline server count
var onlineServers, offlineServers int64
err = query.Model(&node.Server{}).Where("`last_reported_at` > ?", now.Add(-5*time.Minute)).Count(&onlineServers).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Count online servers error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Count online servers error: %v", err)
}
err = query.Model(&node.Server{}).Where("`last_reported_at` <= ? OR `last_reported_at` IS NULL", now.Add(-5*time.Minute)).Count(&offlineServers).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Count offline servers error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Count offline servers error: %v", err)
}
// TodayUpload, TodayDownload, MonthlyUpload, MonthlyDownload
var todayUpload, todayDownload, monthlyUpload, monthlyDownload int64
type trafficSum struct {
Upload int64
Download int64
}
var todayTraffic trafficSum
// Today
err = query.Model(&traffic.TrafficLog{}).Select("SUM(upload) AS upload, SUM(download) AS download").
Where("timestamp BETWEEN ? AND ?", todayStart, todayEnd).
Scan(&todayTraffic).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Sum today traffic error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Sum today traffic error: %v", err)
}
todayUpload = todayTraffic.Upload
todayDownload = todayTraffic.Download
// Monthly
monthlyUpload += todayUpload
monthlyDownload += todayDownload
for i := now.Day() - 1; i >= 1; i-- {
var logInfo log.SystemLog
date := time.Date(now.Year(), now.Month(), i, 0, 0, 0, 0, now.Location()).Format(time.DateOnly)
err = query.Model(&log.SystemLog{}).Where("`date` = ? AND `type` = ?", date, log.TypeTrafficStat).First(&logInfo).Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
l.Errorw("[QueryServerTotalDataLogic] Query daily traffic stat log error", logger.Field("error", err.Error()), logger.Field("date", date))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query daily traffic stat log error: %v", err)
}
resp.ServerTrafficRankingYesterday = serverTrafficData
}
// 获取昨日用户流量排行榜 前10
userTrafficRankingYesterday, err := l.svcCtx.NodeCache.GetYesterdayUserTotalTrafficRank(l.ctx)
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Get yesterday user total traffic rank failed", logger.Field("error", err.Error()))
}
if len(userTrafficRankingYesterday) > 0 {
var userTrafficData []types.UserTrafficData
for _, rank := range userTrafficRankingYesterday {
userTrafficData = append(userTrafficData, types.UserTrafficData{
SID: rank.SID,
Upload: rank.Upload,
Download: rank.Download,
})
if logInfo.Id > 0 {
var stat log.TrafficStat
err = stat.Unmarshal([]byte(logInfo.Content))
if err != nil {
l.Errorw("[QueryServerTotalDataLogic] Unmarshal daily traffic stat log error", logger.Field("error", err.Error()), logger.Field("date", date))
continue
}
monthlyUpload += stat.Upload
monthlyDownload += stat.Download
}
resp.UserTrafficRankingYesterday = userTrafficData
}
resp = &types.ServerTotalDataResponse{
OnlineUsers: onlineUsers,
OnlineServers: onlineServers,
OfflineServers: offlineServers,
TodayUpload: todayUpload,
TodayDownload: todayDownload,
MonthlyUpload: monthlyUpload,
MonthlyDownload: monthlyDownload,
UpdatedAt: now.Unix(),
ServerTrafficRankingToday: todayServerRanking,
ServerTrafficRankingYesterday: yesterdayTop10Server,
UserTrafficRankingToday: userTodayTrafficRanking,
UserTrafficRankingYesterday: yesterdayUserRankData,
}
return resp, nil
}
func (l *QueryServerTotalDataLogic) mockRevenueStatistics() *types.ServerTotalDataResponse {
now := time.Now()
// Generate server traffic ranking data for today (top 10)
serverTrafficToday := make([]types.ServerTrafficData, 10)
serverNames := []string{"香港-01", "美国-洛杉矶", "日本-东京", "新加坡-01", "韩国-首尔", "台湾-01", "德国-法兰克福", "英国-伦敦", "加拿大-多伦多", "澳洲-悉尼"}
for i := 0; i < 10; i++ {
upload := int64(500000000 + (i * 100000000) + (i%3)*200000000) // 500MB - 1.5GB
download := int64(2000000000 + (i * 300000000) + (i%4)*500000000) // 2GB - 8GB
serverTrafficToday[i] = types.ServerTrafficData{
ServerId: int64(i + 1),
Name: serverNames[i],
Upload: upload,
Download: download,
}
}
// Generate server traffic ranking data for yesterday (top 10)
serverTrafficYesterday := make([]types.ServerTrafficData, 10)
for i := 0; i < 10; i++ {
upload := int64(480000000 + (i * 95000000) + (i%3)*180000000)
download := int64(1900000000 + (i * 280000000) + (i%4)*450000000)
serverTrafficYesterday[i] = types.ServerTrafficData{
ServerId: int64(i + 1),
Name: serverNames[i],
Upload: upload,
Download: download,
}
}
//// Generate user traffic ranking data for today (top 10)
//userTrafficToday := make([]types.UserTrafficData, 10)
//for i := 0; i < 10; i++ {
// upload := int64(100000000 + (i*20000000) + (i%5)*50000000) // 100MB - 400MB
// download := int64(800000000 + (i*150000000) + (i%3)*300000000) // 800MB - 3GB
// userTrafficToday[i] = types.UserTrafficData{
// SID: int64(10001 + i),
// Upload: upload,
// Download: download,
// }
//}
//// Generate user traffic ranking data for yesterday (top 10)
//userTrafficYesterday := make([]types.UserTrafficData, 10)
//for i := 0; i < 10; i++ {
// upload := int64(95000000 + (i*18000000) + (i%5)*45000000)
// download := int64(750000000 + (i*140000000) + (i%3)*280000000)
// userTrafficYesterday[i] = types.UserTrafficData{
// SID: int64(10001 + i),
// Upload: upload,
// Download: download,
// }
//}
//
return &types.ServerTotalDataResponse{
OnlineUsers: 1688,
OnlineServers: 8,
OfflineServers: 2,
TodayUpload: 8888888888, // ~8.3GB
TodayDownload: 28888888888, // ~26.9GB
MonthlyUpload: 288888888888, // ~269GB
MonthlyDownload: 888888888888, // ~828GB
UpdatedAt: now.Unix(),
ServerTrafficRankingToday: serverTrafficToday,
ServerTrafficRankingYesterday: serverTrafficYesterday,
//UserTrafficRankingToday: userTrafficToday,
//UserTrafficRankingYesterday: userTrafficYesterday,
}
}
@@ -3,9 +3,9 @@ package console
import (
"context"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
)
type QueryTicketWaitReplyLogic struct {
@@ -2,11 +2,13 @@ package console
import (
"context"
"os"
"strings"
"time"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
)
type QueryUserStatisticsLogic struct {
@@ -25,6 +27,9 @@ func NewQueryUserStatisticsLogic(ctx context.Context, svcCtx *svc.ServiceContext
}
func (l *QueryUserStatisticsLogic) QueryUserStatistics() (resp *types.UserStatisticsResponse, err error) {
if strings.ToLower(os.Getenv("PPANEL_MODE")) == "demo" {
return l.mockRevenueStatistics(), nil
}
resp = &types.UserStatisticsResponse{}
now := time.Now()
// query today user register count
@@ -56,8 +61,24 @@ func (l *QueryUserStatisticsLogic) QueryUserStatistics() (resp *types.UserStatis
} else {
resp.Monthly.NewOrderUsers = newMonth
resp.Monthly.RenewalOrderUsers = renewalMonth
// TODO: Check the purchase status in the past seven days
resp.Monthly.List = make([]types.UserStatistics, 0)
}
// Get monthly daily user statistics list for the current month (from 1st to current date)
monthlyListData, err := l.svcCtx.UserModel.QueryDailyUserStatisticsList(l.ctx, now)
if err != nil {
l.Errorw("[QueryUserStatisticsLogic] QueryDailyUserStatisticsList error", logger.Field("error", err.Error()))
// Don't return error, just log it and continue with empty list
} else {
monthlyList := make([]types.UserStatistics, len(monthlyListData))
for i, data := range monthlyListData {
monthlyList[i] = types.UserStatistics{
Date: data.Date,
Register: data.Register,
NewOrderUsers: data.NewOrderUsers,
RenewalOrderUsers: data.RenewalOrderUsers,
}
}
resp.Monthly.List = monthlyList
}
// query all user count
@@ -67,5 +88,83 @@ func (l *QueryUserStatisticsLogic) QueryUserStatistics() (resp *types.UserStatis
} else {
resp.All.Register = allUserCount
}
// query all user order counts
allNewOrderUsers, allRenewalOrderUsers, err := l.svcCtx.OrderModel.QueryTotalUserCounts(l.ctx)
if err != nil {
l.Errorw("[QueryUserStatisticsLogic] QueryTotalUserCounts error", logger.Field("error", err.Error()))
} else {
resp.All.NewOrderUsers = allNewOrderUsers
resp.All.RenewalOrderUsers = allRenewalOrderUsers
}
// Get all monthly user statistics list for the past 6 months
allListData, err := l.svcCtx.UserModel.QueryMonthlyUserStatisticsList(l.ctx, now)
if err != nil {
l.Errorw("[QueryUserStatisticsLogic] QueryMonthlyUserStatisticsList error", logger.Field("error", err.Error()))
// Don't return error, just log it and continue with empty list
} else {
allList := make([]types.UserStatistics, len(allListData))
for i, data := range allListData {
allList[i] = types.UserStatistics{
Date: data.Date,
Register: data.Register,
NewOrderUsers: data.NewOrderUsers,
RenewalOrderUsers: data.RenewalOrderUsers,
}
}
resp.All.List = allList
}
return
}
func (l *QueryUserStatisticsLogic) mockRevenueStatistics() *types.UserStatisticsResponse {
now := time.Now()
// Generate daily user statistics for the current month (from 1st to current date)
monthlyList := make([]types.UserStatistics, 7)
for i := 0; i < 7; i++ {
dayDate := now.AddDate(0, 0, -(6 - i))
baseRegister := int64(18 + ((6 - i) * 3) + ((6-i)%3)*8)
monthlyList[i] = types.UserStatistics{
Date: dayDate.Format("2006-01-02"),
Register: baseRegister,
NewOrderUsers: int64(float64(baseRegister) * 0.65),
RenewalOrderUsers: int64(float64(baseRegister) * 0.35),
}
}
// Generate monthly user statistics for the past 6 months (oldest first)
allList := make([]types.UserStatistics, 6)
for i := 0; i < 6; i++ {
monthDate := now.AddDate(0, -(5 - i), 0)
baseRegister := int64(1800 + ((5 - i) * 200) + ((5-i)%2)*500)
allList[i] = types.UserStatistics{
Date: monthDate.Format("2006-01"),
Register: baseRegister,
NewOrderUsers: int64(float64(baseRegister) * 0.65),
RenewalOrderUsers: int64(float64(baseRegister) * 0.35),
}
}
return &types.UserStatisticsResponse{
Today: types.UserStatistics{
Register: 28,
NewOrderUsers: 18,
RenewalOrderUsers: 10,
},
Monthly: types.UserStatistics{
Register: 888,
NewOrderUsers: 588,
RenewalOrderUsers: 300,
List: monthlyList,
},
All: types.UserStatistics{
Register: 18888,
NewOrderUsers: 0, // This field is not used in All statistics
RenewalOrderUsers: 0, // This field is not used in All statistics
List: allList,
},
}
}