From 92e303aaa7d4d94bc28d374e9d67f71573140744 Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Tue, 26 May 2026 22:13:50 -0700 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D(#80):=20=E4=BF=AE=E5=A4=8Dwr?= =?UTF-8?q?apf=E9=9D=9E=E5=B8=B8=E9=87=8F=E6=A0=BC=E5=BC=8F=E4=B8=B2vet?= =?UTF-8?q?=E9=98=BB=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: multica-agent --- .../admin/application/deleteSubscribeApplicationLogic.go | 2 +- internal/logic/admin/server/resetSortWithNodeLogic.go | 2 +- internal/logic/admin/server/resetSortWithServerLogic.go | 2 +- internal/logic/public/user/ws/deviceWsConnectLogic.go | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/logic/admin/application/deleteSubscribeApplicationLogic.go b/internal/logic/admin/application/deleteSubscribeApplicationLogic.go index 57cdd70..1b8456d 100644 --- a/internal/logic/admin/application/deleteSubscribeApplicationLogic.go +++ b/internal/logic/admin/application/deleteSubscribeApplicationLogic.go @@ -29,7 +29,7 @@ func (l *DeleteSubscribeApplicationLogic) DeleteSubscribeApplication(req *types. err := l.svcCtx.ClientModel.Delete(l.ctx, req.Id) if err != nil { l.Errorf("Failed to delete subscribe application with ID %d: %v", req.Id, err) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), err.Error()) + return errors.Wrap(xerr.NewErrCode(xerr.DatabaseDeletedError), err.Error()) } return nil } diff --git a/internal/logic/admin/server/resetSortWithNodeLogic.go b/internal/logic/admin/server/resetSortWithNodeLogic.go index 3866f54..c44b9dd 100644 --- a/internal/logic/admin/server/resetSortWithNodeLogic.go +++ b/internal/logic/admin/server/resetSortWithNodeLogic.go @@ -80,7 +80,7 @@ func (l *ResetSortWithNodeLogic) ResetSortWithNode(req *types.ResetSortRequest) }) if err != nil { l.Errorw("[NodeSort] Update Database Error: ", logger.Field("error", err.Error())) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error()) + return errors.Wrap(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error()) } return nil } diff --git a/internal/logic/admin/server/resetSortWithServerLogic.go b/internal/logic/admin/server/resetSortWithServerLogic.go index 3fbe237..5851b13 100644 --- a/internal/logic/admin/server/resetSortWithServerLogic.go +++ b/internal/logic/admin/server/resetSortWithServerLogic.go @@ -80,7 +80,7 @@ func (l *ResetSortWithServerLogic) ResetSortWithServer(req *types.ResetSortReque }) if err != nil { l.Errorw("[NodeSort] Update Database Error: ", logger.Field("error", err.Error())) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error()) + return errors.Wrap(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error()) } return nil } diff --git a/internal/logic/public/user/ws/deviceWsConnectLogic.go b/internal/logic/public/user/ws/deviceWsConnectLogic.go index 9e56e12..14a32f5 100644 --- a/internal/logic/public/user/ws/deviceWsConnectLogic.go +++ b/internal/logic/public/user/ws/deviceWsConnectLogic.go @@ -39,14 +39,14 @@ func (l *DeviceWsConnectLogic) DeviceWsConnect(c *gin.Context) error { value, _ = c.GetQuery("identifier") if value == nil || value.(string) == "" { l.Errorf("DeviceWsConnectLogic DeviceWsConnect identifier is empty") - return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "identifier is empty") + return errors.Wrap(xerr.NewErrCode(xerr.InvalidParams), "identifier is empty") } } identifier := value.(string) _, err := l.svcCtx.UserModel.FindOneDeviceByIdentifier(l.ctx, identifier) if err != nil && !sysErr.Is(err, gorm.ErrRecordNotFound) { l.Errorf("DeviceWsConnectLogic DeviceWsConnect FindOneDeviceByIdentifier err: %v", err) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), err.Error()) + return errors.Wrap(xerr.NewErrCode(xerr.DatabaseQueryError), err.Error()) } value = l.ctx.Value(constant.CtxKeyUser) @@ -67,7 +67,7 @@ func (l *DeviceWsConnectLogic) DeviceWsConnect(c *gin.Context) error { err := l.svcCtx.UserModel.InsertDevice(l.ctx, &device) if err != nil { l.Errorf("DeviceWsConnectLogic DeviceWsConnect InsertDevice err: %v", err) - return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), err.Error()) + return errors.Wrap(xerr.NewErrCode(xerr.DatabaseInsertError), err.Error()) } } //默认在线设备1