From 306300244d132258546b39b110e9d14927eadb33 Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Mon, 1 Dec 2025 00:22:36 -0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A):?= =?UTF-8?q?=20=E7=A7=BB=E5=8A=A8=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BB=A3=E7=A0=81=E4=BD=8D=E7=BD=AE=E4=BB=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/bindEmailWithVerificationLogic.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/logic/public/user/bindEmailWithVerificationLogic.go b/internal/logic/public/user/bindEmailWithVerificationLogic.go index 6c9b818..17409b9 100644 --- a/internal/logic/public/user/bindEmailWithVerificationLogic.go +++ b/internal/logic/public/user/bindEmailWithVerificationLogic.go @@ -127,6 +127,14 @@ func (l *BindEmailWithVerificationLogic) BindEmailWithVerification(req *types.Bi } } } + // 获取原设备信息，以保留IP和UserAgent + oldDevice, err := l.svcCtx.UserModel.FindOneDeviceByIdentifier(l.ctx, deviceIdentifier) + var deviceIP, deviceUA string + if err == nil && oldDevice != nil { + deviceIP = oldDevice.Ip + deviceUA = oldDevice.UserAgent + } + l.Infow("邮箱已存在，将设备转移到现有邮箱用户", logger.Field("email", req.Email), logger.Field("email_user_id", emailUserId)) @@ -158,14 +166,6 @@ func (l *BindEmailWithVerificationLogic) BindEmailWithVerification(req *types.Bi return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "删除用户记录失败") } - // 获取原设备信息，以保留IP和UserAgent - oldDevice, err := l.svcCtx.UserModel.FindOneDeviceByIdentifier(l.ctx, deviceIdentifier) - var deviceIP, deviceUA string - if err == nil && oldDevice != nil { - deviceIP = oldDevice.Ip - deviceUA = oldDevice.UserAgent - } - err = l.createDeviceRecordForEmailUser(emailUserId, deviceIdentifier, deviceIP, deviceUA) if err != nil { l.Errorw("创建邮箱用户设备记录失败", logger.Field("error", err.Error()), logger.Field("email_user_id", emailUserId))