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>

internal/logic/admin/user/createUserLogic.go

@@ -39,10 +39,12 @@ func (l *CreateUserLogic) CreateUser(req *types.CreateUserRequest) error {
 	}
 	pwd := tool.EncodePassWord(req.Password)
 	newUser := &user.User{
-		Password:  pwd,
-		ReferCode: req.ReferCode,
-		Balance:   req.Balance,
-		IsAdmin:   &req.IsAdmin,
+		Password:           pwd,
+		ReferralPercentage: req.ReferralPercentage,
+		OnlyFirstPurchase:  &req.OnlyFirstPurchase,
+		ReferCode:          req.ReferCode,
+		Balance:            req.Balance,
+		IsAdmin:            &req.IsAdmin,
 	}
 	var ams []user.AuthMethods
 

internal/logic/admin/user/getUserListLogic.go

@@ -41,20 +41,20 @@ func (l *GetUserListLogic) GetUserList(req *types.GetUserListRequest) (*types.Ge
 	userRespList := make([]types.User, 0, len(list))
 
 	for _, item := range list {
-		var user types.User
-		tool.DeepCopy(&user, item)
+		var u types.User
+		tool.DeepCopy(&u, item)
 
 		// 处理 AuthMethods
-		authMethods := make([]types.UserAuthMethod, len(user.AuthMethods)) // 直接创建目标 slice
-		for i, method := range user.AuthMethods {
+		authMethods := make([]types.UserAuthMethod, len(u.AuthMethods)) // 直接创建目标 slice
+		for i, method := range u.AuthMethods {
 			tool.DeepCopy(&authMethods[i], method)
 			if method.AuthType == "mobile" {
 				authMethods[i].AuthIdentifier = phone.FormatToInternational(method.AuthIdentifier)
 			}
 		}
-		user.AuthMethods = authMethods
+		u.AuthMethods = authMethods
 
-		userRespList = append(userRespList, user)
+		userRespList = append(userRespList, u)
 	}
 
 	return &types.GetUserListResponse{

internal/logic/admin/user/getUserLoginLogsLogic.go

@@ -3,11 +3,10 @@ package user
 import (
 	"context"
 
-	"github.com/perfect-panel/server/internal/model/user"
+	"github.com/perfect-panel/server/internal/model/log"
 	"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/tool"
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
 )
@@ -28,15 +27,34 @@ func NewGetUserLoginLogsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 }
 
 func (l *GetUserLoginLogsLogic) GetUserLoginLogs(req *types.GetUserLoginLogsRequest) (resp *types.GetUserLoginLogsResponse, err error) {
-	data, total, err := l.svcCtx.UserModel.FilterLoginLogList(l.ctx, req.Page, req.Size, &user.LoginLogFilterParams{
-		UserId: req.UserId,
+	data, total, err := l.svcCtx.LogModel.FilterSystemLog(l.ctx, &log.FilterParams{
+		Page:     req.Page,
+		Size:     req.Size,
+		Type:     log.TypeLogin.Uint8(),
+		ObjectID: req.UserId,
 	})
 	if err != nil {
 		l.Errorw("[GetUserLoginLogs] get user login logs failed", logger.Field("error", err.Error()), logger.Field("request", req))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get user login logs failed: %v", err.Error())
 	}
 	var list []types.UserLoginLog
-	tool.DeepCopy(&list, data)
+
+	for _, datum := range data {
+		var content log.Login
+		if err = content.Unmarshal([]byte(datum.Content)); err != nil {
+			l.Errorf("[GetUserLoginLogs] unmarshal login log content failed: %v", err.Error())
+			continue
+		}
+		list = append(list, types.UserLoginLog{
+			Id:        datum.Id,
+			UserId:    datum.ObjectID,
+			LoginIP:   content.LoginIP,
+			UserAgent: content.UserAgent,
+			Success:   content.Success,
+			Timestamp: datum.CreatedAt.UnixMilli(),
+		})
+	}
+
 	return &types.GetUserLoginLogsResponse{
 		Total: total,
 		List:  list,

internal/logic/admin/user/getUserSubscribeLogsLogic.go

@@ -3,7 +3,7 @@ package user
 import (
 	"context"
 
-	"github.com/perfect-panel/server/internal/model/user"
+	"github.com/perfect-panel/server/internal/model/log"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/logger"
@@ -28,10 +28,7 @@ func NewGetUserSubscribeLogsLogic(ctx context.Context, svcCtx *svc.ServiceContex
 }
 
 func (l *GetUserSubscribeLogsLogic) GetUserSubscribeLogs(req *types.GetUserSubscribeLogsRequest) (resp *types.GetUserSubscribeLogsResponse, err error) {
-	data, total, err := l.svcCtx.UserModel.FilterSubscribeLogList(l.ctx, req.Page, req.Size, &user.SubscribeLogFilterParams{
-		UserSubscribeId: req.SubscribeId,
-		UserId:          req.UserId,
-	})
+	data, total, err := l.svcCtx.LogModel.FilterSystemLog(l.ctx, &log.FilterParams{})
 
 	if err != nil {
 		l.Errorw("[GetUserSubscribeLogs] Get User Subscribe Logs Error:", logger.Field("err", err.Error()))

internal/logic/admin/user/getUserSubscribeResetTrafficLogsLogic.go

@@ -0,0 +1,62 @@
+package user
+
+import (
+	"context"
+
+	"github.com/perfect-panel/server/internal/model/log"
+	"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"
+)
+
+type GetUserSubscribeResetTrafficLogsLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+// Get user subcribe reset traffic logs
+func NewGetUserSubscribeResetTrafficLogsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserSubscribeResetTrafficLogsLogic {
+	return &GetUserSubscribeResetTrafficLogsLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetUserSubscribeResetTrafficLogsLogic) GetUserSubscribeResetTrafficLogs(req *types.GetUserSubscribeResetTrafficLogsRequest) (resp *types.GetUserSubscribeResetTrafficLogsResponse, err error) {
+	data, total, err := l.svcCtx.LogModel.FilterSystemLog(l.ctx, &log.FilterParams{
+		Page:     req.Page,
+		Size:     req.Size,
+		Type:     log.TypeResetSubscribe.Uint8(),
+		ObjectID: req.UserSubscribeId,
+	})
+	if err != nil {
+		l.Errorf("[ResetSubscribeTrafficLog] failed to filter system log: %v", err)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "FilterSystemLog failed, err: %v", err)
+	}
+
+	var list []types.ResetSubscribeTrafficLog
+
+	for _, item := range data {
+		var content log.ResetSubscribe
+		if err = content.Unmarshal([]byte(item.Content)); err != nil {
+			l.Errorf("[ResetSubscribeTrafficLog] failed to unmarshal log: %v", err)
+			continue
+		}
+		list = append(list, types.ResetSubscribeTrafficLog{
+			Id:              item.Id,
+			Type:            content.Type,
+			OrderNo:         content.OrderNo,
+			Timestamp:       content.Timestamp,
+			UserSubscribeId: item.ObjectID,
+		})
+	}
+
+	return &types.GetUserSubscribeResetTrafficLogsResponse{
+		Total: total,
+		List:  list,
+	}, nil
+}

internal/logic/admin/user/updateUserBasicInfoLogic.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"os"
 	"strings"
+	"time"
 
+	"github.com/perfect-panel/server/internal/model/log"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/logger"
@@ -37,13 +39,90 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 
 	isDemo := strings.ToLower(os.Getenv("PPANEL_MODE")) == "demo"
 
-	tool.DeepCopy(userInfo, req)
 	if req.Avatar != "" && !tool.IsValidImageSize(req.Avatar, 1024) {
 		return errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "Invalid Image Size")
 	}
-	userInfo.Balance = req.Balance
-	userInfo.GiftAmount = req.GiftAmount
-	userInfo.Commission = req.Commission
+
+	if userInfo.Balance != req.Balance {
+		change := req.Balance - userInfo.Balance
+		balanceLog := log.Balance{
+			Type:      log.BalanceTypeAdjust,
+			Amount:    change,
+			OrderNo:   "",
+			Balance:   req.Balance,
+			Timestamp: time.Now().UnixMilli(),
+		}
+		content, _ := balanceLog.Marshal()
+
+		err = l.svcCtx.LogModel.Insert(l.ctx, &log.SystemLog{
+			Type:     log.TypeBalance.Uint8(),
+			Date:     time.Now().Format(time.DateOnly),
+			ObjectID: userInfo.Id,
+			Content:  string(content),
+		})
+		if err != nil {
+			l.Errorw("[UpdateUserBasicInfoLogic] Insert Balance Log Error:", logger.Field("err", err.Error()), logger.Field("userId", req.UserId))
+			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Insert Balance Log Error")
+		}
+		userInfo.Balance = req.Balance
+	}
+
+	if userInfo.GiftAmount != req.GiftAmount {
+		change := req.GiftAmount - userInfo.GiftAmount
+		if change != 0 {
+			var changeType uint16
+			if userInfo.GiftAmount < req.GiftAmount {
+				changeType = log.GiftTypeIncrease
+			} else {
+				changeType = log.GiftTypeReduce
+			}
+			giftLog := log.Gift{
+				Type:      changeType,
+				Amount:    change,
+				Balance:   req.GiftAmount,
+				Remark:    "Admin adjustment",
+				Timestamp: time.Now().UnixMilli(),
+			}
+			content, _ := giftLog.Marshal()
+			// Add gift amount change log
+			err = l.svcCtx.LogModel.Insert(l.ctx, &log.SystemLog{
+				Type:     log.TypeGift.Uint8(),
+				Date:     time.Now().Format(time.DateOnly),
+				ObjectID: userInfo.Id,
+				Content:  string(content),
+			})
+			if err != nil {
+				l.Errorw("[UpdateUserBasicInfoLogic] Insert Balance Log Error:", logger.Field("err", err.Error()), logger.Field("userId", req.UserId))
+				return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Insert Balance Log Error")
+			}
+			userInfo.GiftAmount = req.GiftAmount
+		}
+	}
+
+	if req.Commission != userInfo.Commission {
+
+		commentLog := log.Commission{
+			Type:      log.CommissionTypeAdjust,
+			Amount:    req.Commission - userInfo.Commission,
+			Timestamp: time.Now().UnixMilli(),
+		}
+
+		content, _ := commentLog.Marshal()
+		err = l.svcCtx.LogModel.Insert(l.ctx, &log.SystemLog{
+			Type:     log.TypeCommission.Uint8(),
+			Date:     time.Now().Format(time.DateOnly),
+			ObjectID: userInfo.Id,
+			Content:  string(content),
+		})
+		if err != nil {
+			l.Errorw("[UpdateUserBasicInfoLogic] Insert Commission Log Error:", logger.Field("err", err.Error()), logger.Field("userId", req.UserId))
+			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Insert Commission Log Error")
+		}
+		userInfo.Commission = req.Commission
+	}
+	tool.DeepCopy(userInfo, req)
+	userInfo.OnlyFirstPurchase = &req.OnlyFirstPurchase
+	userInfo.ReferralPercentage = req.ReferralPercentage
 
 	if req.Password != "" {
 		if userInfo.Id == 2 && isDemo {