diff --git a/model/gmodel/var.go b/model/gmodel/var.go index 9f603ae5..71fd02ff 100644 --- a/model/gmodel/var.go +++ b/model/gmodel/var.go @@ -38,12 +38,12 @@ func FsBool(v bool) *bool { // SubscriptionStatus 订阅状态 type SubscriptionStatus struct { - NotificationEmail *struct { + NotificationEmail struct { OrderUpdate bool `json:"order_update"` Newseleter bool `json:"newseleter"` } `json:"notification_email"` - NotificationPhone *struct { + NotificationPhone struct { OrderUpdate bool `json:"order_update"` Newseleter bool `json:"newseleter"` } `json:"notification_phone"` diff --git a/server/auth/internal/logic/userresettokenlogic.go b/server/auth/internal/logic/userresettokenlogic.go index b7150b9a..61ab8fdb 100644 --- a/server/auth/internal/logic/userresettokenlogic.go +++ b/server/auth/internal/logic/userresettokenlogic.go @@ -39,7 +39,7 @@ func (l *UserResetTokenLogic) UserResetToken(req *types.RequestUserResetToken, u user, err := l.svcCtx.AllModels.FsUser.FindUserByEmail(context.TODO(), req.Email) if err != nil { logx.Error(err) - return resp.SetStatus(basic.CodeRequestParamsErr, err.Error()) + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, err.Error()) } token := &auth.ResetToken{