fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming 2023-10-11 11:49:11 +08:00
commit 350f06116e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
model/gmodel/var.go
View File

@ -38,14 +38,14 @@ 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 {
OrderUpdate bool `json:"order_update"`
Newseleter bool `json:"newseleter"`
NotificationPhone struct {
// OrderUpdate bool `json:"order_update"`
Newseleter bool `json:"newseleter"`
} `json:"notification_phone"`
}

2
server/auth/internal/logic/userresettokenlogic.go
View File

@ -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{