diff --git a/apis/admin/log.api b/apis/admin/log.api index d236943..1cd597e 100644 --- a/apis/admin/log.api +++ b/apis/admin/log.api @@ -41,7 +41,7 @@ type ( UserAgent string `json:"user_agent"` ClientIP string `json:"client_ip"` UserSubscribeId int64 `json:"user_subscribe_id"` - SubscribedAt int64 `json:"subscribed_at"` + Timestamp int64 `json:"timestamp"` } FilterSubscribeLogRequest { FilterLogParams @@ -57,7 +57,7 @@ type ( LoginIP string `json:"login_ip"` UserAgent string `json:"user_agent"` Success bool `json:"success"` - LoginTime int64 `json:"login_time"` + Timestamp int64 `json:"timestamp"` } FilterLoginLogRequest { FilterLogParams @@ -68,12 +68,12 @@ type ( List []LoginLog `json:"list"` } RegisterLog { - UserId int64 `json:"user_id"` - AuthMethod string `json:"auth_method"` - Identifier string `json:"identifier"` - RegisterIP string `json:"register_ip"` - UserAgent string `json:"user_agent"` - RegisterTime int64 `json:"register_time"` + UserId int64 `json:"user_id"` + AuthMethod string `json:"auth_method"` + Identifier string `json:"identifier"` + RegisterIP string `json:"register_ip"` + UserAgent string `json:"user_agent"` + Timestamp int64 `json:"timestamp"` } FilterRegisterLogRequest { FilterLogParams @@ -88,7 +88,7 @@ type ( UserId int64 `json:"user_id"` UserSubscribeId int64 `json:"user_subscribe_id"` OrderNo string `json:"order_no,omitempty"` - ResetAt int64 `json:"reset_at"` + Timestamp int64 `json:"timestamp"` } FilterResetSubscribeLogRequest { FilterLogParams @@ -156,7 +156,7 @@ type ( Amount int64 `json:"amount"` Balance int64 `json:"balance"` Remark string `json:"remark,omitempty"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } FilterGiftLogRequest { FilterLogParams diff --git a/apis/types.api b/apis/types.api index 827142e..7ebf4ba 100644 --- a/apis/types.api +++ b/apis/types.api @@ -515,7 +515,7 @@ type ( Token string `json:"token"` IP string `json:"ip"` UserAgent string `json:"user_agent"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } UserLoginLog { Id int64 `json:"id"` @@ -523,7 +523,7 @@ type ( LoginIP string `json:"login_ip"` UserAgent string `json:"user_agent"` Success bool `json:"success"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } MessageLog { Id int64 `json:"id"` @@ -750,7 +750,7 @@ type ( Type uint16 `json:"type"` UserSubscribeId int64 `json:"user_subscribe_id"` OrderNo string `json:"order_no,omitempty"` - ResetAt int64 `json:"reset_at"` + Timestamp int64 `json:"timestamp"` } BalanceLog { Type uint16 `json:"type"` @@ -765,7 +765,7 @@ type ( UserId int64 `json:"user_id"` Amount int64 `json:"amount"` OrderNo string `json:"order_no"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } ) diff --git a/internal/logic/admin/log/filterCommissionLogLogic.go b/internal/logic/admin/log/filterCommissionLogLogic.go index ff31546..6e4020d 100644 --- a/internal/logic/admin/log/filterCommissionLogLogic.go +++ b/internal/logic/admin/log/filterCommissionLogLogic.go @@ -51,7 +51,7 @@ func (l *FilterCommissionLogLogic) FilterCommissionLog(req *types.FilterCommissi Type: content.Type, Amount: content.Amount, OrderNo: content.OrderNo, - CreatedAt: content.CreatedAt, + Timestamp: content.Timestamp, }) } return &types.FilterCommissionLogResponse{ diff --git a/internal/logic/admin/log/filterGiftLogLogic.go b/internal/logic/admin/log/filterGiftLogLogic.go index bab93e4..5b23119 100644 --- a/internal/logic/admin/log/filterGiftLogLogic.go +++ b/internal/logic/admin/log/filterGiftLogLogic.go @@ -57,7 +57,7 @@ func (l *FilterGiftLogLogic) FilterGiftLog(req *types.FilterGiftLogRequest) (res Amount: content.Amount, Balance: content.Balance, Remark: content.Remark, - CreatedAt: content.CreatedAt, + Timestamp: content.Timestamp, }) } diff --git a/internal/logic/admin/log/filterLoginLogLogic.go b/internal/logic/admin/log/filterLoginLogLogic.go index f8d4096..b3e1f5b 100644 --- a/internal/logic/admin/log/filterLoginLogLogic.go +++ b/internal/logic/admin/log/filterLoginLogLogic.go @@ -54,7 +54,7 @@ func (l *FilterLoginLogLogic) FilterLoginLog(req *types.FilterLoginLogRequest) ( LoginIP: item.LoginIP, UserAgent: item.UserAgent, Success: item.Success, - LoginTime: item.LoginTime, + Timestamp: item.Timestamp, }) } diff --git a/internal/logic/admin/log/filterRegisterLogLogic.go b/internal/logic/admin/log/filterRegisterLogLogic.go index 7913e8c..81c9684 100644 --- a/internal/logic/admin/log/filterRegisterLogLogic.go +++ b/internal/logic/admin/log/filterRegisterLogLogic.go @@ -50,12 +50,12 @@ func (l *FilterRegisterLogLogic) FilterRegisterLog(req *types.FilterRegisterLogR continue } list = append(list, types.RegisterLog{ - UserId: datum.ObjectID, - AuthMethod: item.AuthMethod, - Identifier: item.Identifier, - RegisterIP: item.RegisterIP, - UserAgent: item.UserAgent, - RegisterTime: item.RegisterTime, + UserId: datum.ObjectID, + AuthMethod: item.AuthMethod, + Identifier: item.Identifier, + RegisterIP: item.RegisterIP, + UserAgent: item.UserAgent, + Timestamp: item.Timestamp, }) } diff --git a/internal/logic/admin/log/filterResetSubscribeLogLogic.go b/internal/logic/admin/log/filterResetSubscribeLogLogic.go index 144d823..31e2d2a 100644 --- a/internal/logic/admin/log/filterResetSubscribeLogLogic.go +++ b/internal/logic/admin/log/filterResetSubscribeLogLogic.go @@ -55,7 +55,7 @@ func (l *FilterResetSubscribeLogLogic) FilterResetSubscribeLog(req *types.Filter UserId: content.UserId, UserSubscribeId: item.ObjectID, OrderNo: content.OrderNo, - ResetAt: content.ResetAt, + Timestamp: content.Timestamp, }) } diff --git a/internal/logic/admin/log/filterSubscribeLogLogic.go b/internal/logic/admin/log/filterSubscribeLogLogic.go index 5da8221..7e7033c 100644 --- a/internal/logic/admin/log/filterSubscribeLogLogic.go +++ b/internal/logic/admin/log/filterSubscribeLogLogic.go @@ -53,7 +53,7 @@ func (l *FilterSubscribeLogLogic) FilterSubscribeLog(req *types.FilterSubscribeL UserAgent: content.UserAgent, ClientIP: content.ClientIP, UserSubscribeId: content.UserSubscribeId, - SubscribedAt: datum.CreatedAt.UnixMilli(), + Timestamp: datum.CreatedAt.UnixMilli(), }) } diff --git a/internal/logic/admin/user/getUserLoginLogsLogic.go b/internal/logic/admin/user/getUserLoginLogsLogic.go index 7a702e5..afaba61 100644 --- a/internal/logic/admin/user/getUserLoginLogsLogic.go +++ b/internal/logic/admin/user/getUserLoginLogsLogic.go @@ -51,7 +51,7 @@ func (l *GetUserLoginLogsLogic) GetUserLoginLogs(req *types.GetUserLoginLogsRequ LoginIP: content.LoginIP, UserAgent: content.UserAgent, Success: content.Success, - CreatedAt: datum.CreatedAt.UnixMilli(), + Timestamp: datum.CreatedAt.UnixMilli(), }) } diff --git a/internal/logic/admin/user/getUserSubscribeResetTrafficLogsLogic.go b/internal/logic/admin/user/getUserSubscribeResetTrafficLogsLogic.go index b3c3638..fb01d01 100644 --- a/internal/logic/admin/user/getUserSubscribeResetTrafficLogsLogic.go +++ b/internal/logic/admin/user/getUserSubscribeResetTrafficLogsLogic.go @@ -50,7 +50,7 @@ func (l *GetUserSubscribeResetTrafficLogsLogic) GetUserSubscribeResetTrafficLogs Id: item.Id, Type: content.Type, OrderNo: content.OrderNo, - ResetAt: content.ResetAt, + Timestamp: content.Timestamp, UserSubscribeId: item.ObjectID, }) } diff --git a/internal/logic/auth/telephoneUserRegisterLogic.go b/internal/logic/auth/telephoneUserRegisterLogic.go index 8273f79..861f828 100644 --- a/internal/logic/auth/telephoneUserRegisterLogic.go +++ b/internal/logic/auth/telephoneUserRegisterLogic.go @@ -181,11 +181,11 @@ func (l *TelephoneUserRegisterLogic) TelephoneUserRegister(req *types.TelephoneR // Register log registerLog := log.Register{ - AuthMethod: "mobile", - Identifier: phoneNumber, - RegisterIP: req.IP, - UserAgent: req.UserAgent, - RegisterTime: time.Now().UnixMilli(), + AuthMethod: "mobile", + Identifier: phoneNumber, + RegisterIP: req.IP, + UserAgent: req.UserAgent, + Timestamp: time.Now().UnixMilli(), } content, _ = registerLog.Marshal() if err := l.svcCtx.LogModel.Insert(l.ctx, &log.SystemLog{ diff --git a/internal/logic/auth/userRegisterLogic.go b/internal/logic/auth/userRegisterLogic.go index e2eca17..647f480 100644 --- a/internal/logic/auth/userRegisterLogic.go +++ b/internal/logic/auth/userRegisterLogic.go @@ -169,11 +169,11 @@ func (l *UserRegisterLogic) UserRegister(req *types.UserRegisterRequest) (resp * // Register log registerLog := log.Register{ - AuthMethod: "email", - Identifier: req.Email, - RegisterIP: req.IP, - UserAgent: req.UserAgent, - RegisterTime: time.Now().UnixMilli(), + AuthMethod: "email", + Identifier: req.Email, + RegisterIP: req.IP, + UserAgent: req.UserAgent, + Timestamp: time.Now().UnixMilli(), } content, _ = registerLog.Marshal() if err = l.svcCtx.LogModel.Insert(l.ctx, &log.SystemLog{ diff --git a/internal/logic/public/order/closeOrderLogic.go b/internal/logic/public/order/closeOrderLogic.go index 6400f01..ced53b8 100644 --- a/internal/logic/public/order/closeOrderLogic.go +++ b/internal/logic/public/order/closeOrderLogic.go @@ -102,7 +102,7 @@ func (l *CloseOrderLogic) CloseOrder(req *types.CloseOrderRequest) error { Amount: orderInfo.GiftAmount, Balance: deduction, Remark: "Order cancellation refund", - CreatedAt: time.Now().UnixMilli(), + Timestamp: time.Now().UnixMilli(), } content, _ := giftLog.Marshal() diff --git a/internal/logic/public/order/purchaseLogic.go b/internal/logic/public/order/purchaseLogic.go index dd9e2c7..94dbb16 100644 --- a/internal/logic/public/order/purchaseLogic.go +++ b/internal/logic/public/order/purchaseLogic.go @@ -204,7 +204,7 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P Amount: orderInfo.GiftAmount, Balance: u.GiftAmount, Remark: "Purchase order deduction", - CreatedAt: time.Now().UnixMilli(), + Timestamp: time.Now().UnixMilli(), } content, _ := giftLog.Marshal() diff --git a/internal/logic/public/order/renewalLogic.go b/internal/logic/public/order/renewalLogic.go index 6b4ace2..5680c9b 100644 --- a/internal/logic/public/order/renewalLogic.go +++ b/internal/logic/public/order/renewalLogic.go @@ -171,7 +171,7 @@ func (l *RenewalLogic) Renewal(req *types.RenewalOrderRequest) (resp *types.Rene Amount: orderInfo.GiftAmount, Balance: u.GiftAmount, Remark: "Renewal order deduction", - CreatedAt: time.Now().UnixMilli(), + Timestamp: time.Now().UnixMilli(), } content, _ := giftLog.Marshal() diff --git a/internal/logic/public/order/resetTrafficLogic.go b/internal/logic/public/order/resetTrafficLogic.go index 4762f4f..1fc9b57 100644 --- a/internal/logic/public/order/resetTrafficLogic.go +++ b/internal/logic/public/order/resetTrafficLogic.go @@ -112,7 +112,7 @@ func (l *ResetTrafficLogic) ResetTraffic(req *types.ResetTrafficOrderRequest) (r Amount: orderInfo.GiftAmount, Balance: u.GiftAmount, Remark: "Renewal order deduction", - CreatedAt: time.Now().UnixMilli(), + Timestamp: time.Now().UnixMilli(), } content, _ := giftLog.Marshal() diff --git a/internal/logic/public/user/getLoginLogLogic.go b/internal/logic/public/user/getLoginLogLogic.go index d1291df..a6637f4 100644 --- a/internal/logic/public/user/getLoginLogLogic.go +++ b/internal/logic/public/user/getLoginLogLogic.go @@ -59,7 +59,7 @@ func (l *GetLoginLogLogic) GetLoginLog(req *types.GetLoginLogRequest) (resp *typ LoginIP: content.LoginIP, UserAgent: content.UserAgent, Success: content.Success, - CreatedAt: datum.CreatedAt.UnixMilli(), + Timestamp: datum.CreatedAt.UnixMilli(), }) } diff --git a/internal/logic/public/user/getSubscribeLogLogic.go b/internal/logic/public/user/getSubscribeLogLogic.go index 689eca9..eeb51b9 100644 --- a/internal/logic/public/user/getSubscribeLogLogic.go +++ b/internal/logic/public/user/getSubscribeLogLogic.go @@ -60,7 +60,7 @@ func (l *GetSubscribeLogLogic) GetSubscribeLog(req *types.GetSubscribeLogRequest Token: content.Token, IP: content.ClientIP, UserAgent: content.UserAgent, - CreatedAt: item.CreatedAt.UnixMilli(), + Timestamp: item.CreatedAt.UnixMilli(), }) } diff --git a/internal/logic/public/user/queryUserCommissionLogLogic.go b/internal/logic/public/user/queryUserCommissionLogLogic.go index 23ecb69..c005828 100644 --- a/internal/logic/public/user/queryUserCommissionLogLogic.go +++ b/internal/logic/public/user/queryUserCommissionLogLogic.go @@ -58,7 +58,7 @@ func (l *QueryUserCommissionLogLogic) QueryUserCommissionLog(req *types.QueryUse Type: content.Type, Amount: content.Amount, OrderNo: content.OrderNo, - CreatedAt: content.CreatedAt, + Timestamp: content.Timestamp, }) } diff --git a/internal/model/log/log.go b/internal/model/log/log.go index 553a8a4..1e86628 100644 --- a/internal/model/log/log.go +++ b/internal/model/log/log.go @@ -123,7 +123,7 @@ type Login struct { LoginIP string `json:"login_ip"` UserAgent string `json:"user_agent"` Success bool `json:"success"` - LoginTime int64 `json:"login_time"` + Timestamp int64 `json:"timestamp"` } // Marshal implements the json.Marshaler interface for Login. @@ -145,11 +145,11 @@ func (l *Login) Unmarshal(data []byte) error { // Register represents a registration log entry. type Register struct { - AuthMethod string `json:"auth_method"` - Identifier string `json:"identifier"` - RegisterIP string `json:"register_ip"` - UserAgent string `json:"user_agent"` - RegisterTime int64 `json:"register_time"` + AuthMethod string `json:"auth_method"` + Identifier string `json:"identifier"` + RegisterIP string `json:"register_ip"` + UserAgent string `json:"user_agent"` + Timestamp int64 `json:"timestamp"` } // Marshal implements the json.Marshaler interface for Register. @@ -197,10 +197,10 @@ func (s *Subscribe) Unmarshal(data []byte) error { // ResetSubscribe represents a reset subscription log entry. type ResetSubscribe struct { - Type uint16 `json:"type"` - UserId int64 `json:"user_id"` - OrderNo string `json:"order_no,omitempty"` - ResetAt int64 `json:"reset_at"` + Type uint16 `json:"type"` + UserId int64 `json:"user_id"` + OrderNo string `json:"order_no,omitempty"` + Timestamp int64 `json:"timestamp"` } // Marshal implements the json.Marshaler interface for ResetSubscribe. @@ -251,7 +251,7 @@ type Commission struct { Type uint16 `json:"type"` Amount int64 `json:"amount"` OrderNo string `json:"order_no"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } // Marshal implements the json.Marshaler interface for Commission. @@ -279,7 +279,7 @@ type Gift struct { Amount int64 `json:"amount"` Balance int64 `json:"balance"` Remark string `json:"remark,omitempty"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } // Marshal implements the json.Marshaler interface for Gift. diff --git a/internal/types/types.go b/internal/types/types.go index e0a2e32..24d5893 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -235,7 +235,7 @@ type CommissionLog struct { UserId int64 `json:"user_id"` Amount int64 `json:"amount"` OrderNo string `json:"order_no"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } type Coupon struct { @@ -1109,7 +1109,7 @@ type GiftLog struct { Amount int64 `json:"amount"` Balance int64 `json:"balance"` Remark string `json:"remark,omitempty"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } type GoogleLoginCallbackRequest struct { @@ -1149,7 +1149,7 @@ type LoginLog struct { LoginIP string `json:"login_ip"` UserAgent string `json:"user_agent"` Success bool `json:"success"` - LoginTime int64 `json:"login_time"` + Timestamp int64 `json:"timestamp"` } type LoginResponse struct { @@ -1571,12 +1571,12 @@ type RegisterConfig struct { } type RegisterLog struct { - UserId int64 `json:"user_id"` - AuthMethod string `json:"auth_method"` - Identifier string `json:"identifier"` - RegisterIP string `json:"register_ip"` - UserAgent string `json:"user_agent"` - RegisterTime int64 `json:"register_time"` + UserId int64 `json:"user_id"` + AuthMethod string `json:"auth_method"` + Identifier string `json:"identifier"` + RegisterIP string `json:"register_ip"` + UserAgent string `json:"user_agent"` + Timestamp int64 `json:"timestamp"` } type RenewalOrderRequest struct { @@ -1604,7 +1604,7 @@ type ResetSubscribeLog struct { UserId int64 `json:"user_id"` UserSubscribeId int64 `json:"user_subscribe_id"` OrderNo string `json:"order_no,omitempty"` - ResetAt int64 `json:"reset_at"` + Timestamp int64 `json:"timestamp"` } type ResetSubscribeTrafficLog struct { @@ -1612,7 +1612,7 @@ type ResetSubscribeTrafficLog struct { Type uint16 `json:"type"` UserSubscribeId int64 `json:"user_subscribe_id"` OrderNo string `json:"order_no,omitempty"` - ResetAt int64 `json:"reset_at"` + Timestamp int64 `json:"timestamp"` } type ResetTrafficOrderRequest struct { @@ -1906,7 +1906,7 @@ type SubscribeLog struct { UserAgent string `json:"user_agent"` ClientIP string `json:"client_ip"` UserSubscribeId int64 `json:"user_subscribe_id"` - SubscribedAt int64 `json:"subscribed_at"` + Timestamp int64 `json:"timestamp"` } type SubscribeSortRequest struct { @@ -2327,7 +2327,7 @@ type UserLoginLog struct { LoginIP string `json:"login_ip"` UserAgent string `json:"user_agent"` Success bool `json:"success"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } type UserLoginRequest struct { @@ -2407,7 +2407,7 @@ type UserSubscribeLog struct { Token string `json:"token"` IP string `json:"ip"` UserAgent string `json:"user_agent"` - CreatedAt int64 `json:"created_at"` + Timestamp int64 `json:"timestamp"` } type UserSubscribeTrafficLog struct { diff --git a/queue/logic/order/activateOrderLogic.go b/queue/logic/order/activateOrderLogic.go index 041ca7b..5064200 100644 --- a/queue/logic/order/activateOrderLogic.go +++ b/queue/logic/order/activateOrderLogic.go @@ -389,7 +389,7 @@ func (l *ActivateOrderLogic) handleCommission(ctx context.Context, userInfo *use Type: commissionType, Amount: amount, OrderNo: orderInfo.OrderNo, - CreatedAt: orderInfo.CreatedAt.UnixMilli(), + Timestamp: orderInfo.CreatedAt.UnixMilli(), } content, _ := commissionLog.Marshal() @@ -577,10 +577,10 @@ func (l *ActivateOrderLogic) ResetTraffic(ctx context.Context, orderInfo *order. // insert reset traffic log resetLog := &log.ResetSubscribe{ - Type: log.ResetSubscribeTypePaid, - UserId: userInfo.Id, - OrderNo: orderInfo.OrderNo, - ResetAt: time.Now().UnixMilli(), + Type: log.ResetSubscribeTypePaid, + UserId: userInfo.Id, + OrderNo: orderInfo.OrderNo, + Timestamp: time.Now().UnixMilli(), } content, _ := resetLog.Marshal() diff --git a/queue/logic/traffic/resetTrafficLogic.go b/queue/logic/traffic/resetTrafficLogic.go index ef1956c..0952f30 100644 --- a/queue/logic/traffic/resetTrafficLogic.go +++ b/queue/logic/traffic/resetTrafficLogic.go @@ -602,9 +602,9 @@ func (l *ResetTrafficLogic) clearCache(ctx context.Context, list []*user.Subscri // 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, - ResetAt: time.Now().UnixMilli(), + 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{