From 77e4be3a7185dbb127f4fc90010ce52f9decfc78 Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Mon, 1 Dec 2025 00:44:33 -0800 Subject: [PATCH] =?UTF-8?q?refactor(user):=20=E9=87=8D=E6=9E=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=A7=A3=E7=BB=91=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=94=A8=E6=88=B7=E8=BF=81=E7=A7=BB=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将原有删除设备逻辑改为迁移设备到新匿名用户 - 添加注册日志记录功能 - 优化事务处理流程，确保数据一致性 - 添加试用订阅激活功能 - 完善错误处理和日志记录 --- .../logic/public/user/unbindDeviceLogic.go | 235 ++++++++++-------- 1 file changed, 128 insertions(+), 107 deletions(-) diff --git a/internal/logic/public/user/unbindDeviceLogic.go b/internal/logic/public/user/unbindDeviceLogic.go index 0475d70..b23b5e1 100644 --- a/internal/logic/public/user/unbindDeviceLogic.go +++ b/internal/logic/public/user/unbindDeviceLogic.go @@ -3,13 +3,16 @@ package user import ( "context" "fmt" + "time" "github.com/perfect-panel/server/internal/config" + "github.com/perfect-panel/server/internal/model/log" "github.com/perfect-panel/server/internal/model/user" "github.com/perfect-panel/server/internal/svc" "github.com/perfect-panel/server/internal/types" "github.com/perfect-panel/server/pkg/constant" "github.com/perfect-panel/server/pkg/logger" + "github.com/perfect-panel/server/pkg/tool" "github.com/perfect-panel/server/pkg/uuidx" "github.com/perfect-panel/server/pkg/xerr" "github.com/pkg/errors" @@ -43,138 +46,156 @@ func (l *UnbindDeviceLogic) UnbindDevice(req *types.UnbindDeviceRequest) error { if device.UserId != userInfo.Id { return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "device not belong to user") } - identifier := device.Identifier - var deleteDevice user.Device - l.svcCtx.DB.Transaction(func(tx *gorm.DB) error { - // 业务逻辑修改： 如果解绑； 那么 就把 设备关系 和 邮箱关系 拆开 - // 删除了 设备 记录 - err = tx.Model(&deleteDevice).Where("id = ?", req.Id).First(&deleteDevice).Error + err = l.svcCtx.DB.Transaction(func(tx *gorm.DB) error { + // 1. 查询设备记录 + var device user.Device + err = tx.Model(&device).Where("id = ?", req.Id).First(&device).Error if err != nil { return errors.Wrapf(xerr.NewErrCode(xerr.QueueEnqueueError), "find device err: %v", err) } - err = tx.Delete(deleteDevice).Error - if err != nil { - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete device err: %v", err) - } + + // 2. 查询对应的认证记录 var userAuth user.AuthMethods - err = tx.Model(&userAuth).Where("auth_identifier = ? and auth_type = ?", deleteDevice.Identifier, "device").First(&userAuth).Error + err = tx.Model(&userAuth).Where("auth_identifier = ? and auth_type = ?", device.Identifier, "device").First(&userAuth).Error if err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - return nil - } - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find device online record err: %v", err) + return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find user auth method err: %v", err) } - err = tx.Delete(&userAuth).Error - if err != nil { - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete device online record err: %v", err) + // 3. 创建新用户（匿名用户） + newUser := &user.User{ + Salt: "default", + OnlyFirstPurchase: &l.svcCtx.Config.Invite.OnlyFirstPurchase, } + if err := tx.Create(newUser).Error; err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create user failed: %v", err) + } + + // 生成并更新邀请码 + newUser.ReferCode = uuidx.UserInviteCode(newUser.Id) + if err := tx.Model(&user.User{}).Where("id = ?", newUser.Id).Update("refer_code", newUser.ReferCode).Error; err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update refer code failed: %v", err) + } + + // 3.1 激活试用订阅（如果开启） + if l.svcCtx.Config.Register.EnableTrial { + if err := l.activeTrial(newUser.Id, tx); err != nil { + return err + } + } + + // 3.2 记录注册日志 + registerLog := log.Register{ + AuthMethod: "device", + Identifier: device.Identifier, + RegisterIP: device.Ip, + UserAgent: device.UserAgent, + Timestamp: time.Now().UnixMilli(), + } + content, _ := registerLog.Marshal() + if err := tx.Create(&log.SystemLog{ + Type: log.TypeRegister.Uint8(), + Date: time.Now().Format("2006-01-02"), + ObjectID: newUser.Id, + Content: string(content), + }).Error; err != nil { + l.Errorw("failed to insert register log", + logger.Field("user_id", newUser.Id), + logger.Field("error", err.Error()), + ) + // Log error but don't fail transaction + } + + // 4. 迁移设备和认证记录到新用户 + // 更新设备归属 + if err := tx.Model(&user.Device{}).Where("id = ?", device.Id).Update("user_id", newUser.Id).Error; err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update device owner failed: %v", err) + } + + // 更新认证归属 + if err := tx.Model(&user.AuthMethods{}).Where("id = ?", userAuth.Id).Update("user_id", newUser.Id).Error; err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update auth owner failed: %v", err) + } + + // 5. 检查原用户是否还有其他认证方式，如果没有则删除原用户 var count int64 - err = tx.Model(user.AuthMethods{}).Where("user_id = ?", deleteDevice.UserId).Count(&count).Error + err = tx.Model(user.AuthMethods{}).Where("user_id = ?", device.UserId).Count(&count).Error if err != nil { return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count user auth methods err: %v", err) } if count < 1 { - _ = tx.Where("id = ?", deleteDevice.UserId).Delete(&user.User{}).Error + if err := tx.Where("id = ?", device.UserId).Delete(&user.User{}).Error; err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete old user failed: %v", err) + } } - //remove device cache - deviceCacheKey := fmt.Sprintf("%v:%v", config.DeviceCacheKeyKey, deleteDevice.Identifier) + // 6. 清理缓存 + deviceCacheKey := fmt.Sprintf("%v:%v", config.DeviceCacheKeyKey, device.Identifier) if sessionId, err := l.svcCtx.Redis.Get(l.ctx, deviceCacheKey).Result(); err == nil && sessionId != "" { _ = l.svcCtx.Redis.Del(l.ctx, deviceCacheKey).Err() sessionIdCacheKey := fmt.Sprintf("%v:%v", config.SessionIdKey, sessionId) _ = l.svcCtx.Redis.Del(l.ctx, sessionIdCacheKey).Err() } + l.Infow("设备解绑并迁移成功", + logger.Field("device_identifier", device.Identifier), + logger.Field("old_user_id", device.UserId), + logger.Field("new_user_id", newUser.Id)) + return nil }) - // 最后 创建一个 新的 设备 用户信息 绕过 赠送套餐 - l.registerUserAndDevice(identifier, deleteDevice.Ip, deleteDevice.UserAgent) + + return err +} + +func (l *UnbindDeviceLogic) activeTrial(userId int64, tx *gorm.DB) error { + sub, err := l.svcCtx.SubscribeModel.FindOne(l.ctx, l.svcCtx.Config.Register.TrialSubscribe) + if err != nil { + l.Errorw("failed to find trial subscription template", + logger.Field("user_id", userId), + logger.Field("trial_subscribe_id", l.svcCtx.Config.Register.TrialSubscribe), + logger.Field("error", err.Error()), + ) + return err + } + + startTime := time.Now() + expireTime := tool.AddTime(l.svcCtx.Config.Register.TrialTimeUnit, l.svcCtx.Config.Register.TrialTime, startTime) + subscribeToken := uuidx.SubscribeToken(fmt.Sprintf("Trial-%v", userId)) + subscribeUUID := uuidx.NewUUID().String() + + userSub := &user.Subscribe{ + UserId: userId, + OrderId: 0, + SubscribeId: sub.Id, + StartTime: startTime, + ExpireTime: expireTime, + Traffic: sub.Traffic, + Download: 0, + Upload: 0, + Token: subscribeToken, + UUID: subscribeUUID, + Status: 1, + } + + if err := tx.Create(userSub).Error; err != nil { + l.Errorw("failed to insert trial subscription", + logger.Field("user_id", userId), + logger.Field("error", err.Error()), + ) + return err + } + + l.Infow("trial subscription activated successfully", + logger.Field("user_id", userId), + logger.Field("subscribe_id", sub.Id), + logger.Field("expire_time", expireTime), + logger.Field("traffic", sub.Traffic), + ) + if clearErr := l.svcCtx.NodeModel.ClearServerAllCache(l.ctx); clearErr != nil { + l.Errorf("ClearServerAllCache error: %v", clearErr.Error()) + } return nil } - -func (l *UnbindDeviceLogic) registerUserAndDevice(identifier, ip, userAgent string) (*user.User, error) { - l.Infow("删除新建 设备 用户", - logger.Field("identifier", identifier), - ) - - var userInfo *user.User - err := l.svcCtx.UserModel.Transaction(l.ctx, func(db *gorm.DB) error { - // Create new user - userInfo = &user.User{ - Salt: "default", - OnlyFirstPurchase: &l.svcCtx.Config.Invite.OnlyFirstPurchase, - } - if err := db.Create(userInfo).Error; err != nil { - l.Errorw("failed to create user", - logger.Field("error", err.Error()), - ) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create user failed: %v", err) - } - - // Update refer code - userInfo.ReferCode = uuidx.UserInviteCode(userInfo.Id) - if err := db.Model(&user.User{}).Where("id = ?", userInfo.Id).Update("refer_code", userInfo.ReferCode).Error; err != nil { - l.Errorw("failed to update refer code", - logger.Field("user_id", userInfo.Id), - logger.Field("error", err.Error()), - ) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update refer code failed: %v", err) - } - - // Create device auth method - authMethod := &user.AuthMethods{ - UserId: userInfo.Id, - AuthType: "device", - AuthIdentifier: identifier, - Verified: true, - } - if err := db.Create(authMethod).Error; err != nil { - l.Errorw("failed to create device auth method", - logger.Field("user_id", userInfo.Id), - logger.Field("identifier", identifier), - logger.Field("error", err.Error()), - ) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create device auth method failed: %v", err) - } - - // Insert device record - deviceInfo := &user.Device{ - Ip: ip, - UserId: userInfo.Id, - UserAgent: userAgent, - Identifier: identifier, - Enabled: true, - Online: false, - } - if err := db.Create(deviceInfo).Error; err != nil { - l.Errorw("failed to insert device", - logger.Field("user_id", userInfo.Id), - logger.Field("identifier", identifier), - logger.Field("error", err.Error()), - ) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert device failed: %v", err) - } - - return nil - }) - - if err != nil { - l.Errorw("device registration failed", - logger.Field("identifier", identifier), - logger.Field("error", err.Error()), - ) - return nil, err - } - - l.Infow("device registration completed successfully", - logger.Field("user_id", userInfo.Id), - logger.Field("identifier", identifier), - logger.Field("refer_code", userInfo.ReferCode), - ) - - return userInfo, nil -}