diff --git a/fs_template/reset_password.tpl b/fs_template/get_reset_password_html.tpl similarity index 70% rename from fs_template/reset_password.tpl rename to fs_template/get_reset_password_html.tpl index 828226c6..f5063ed4 100644 --- a/fs_template/reset_password.tpl +++ b/fs_template/get_reset_password_html.tpl @@ -1,11 +1,9 @@ Dear {{ .UserName }}, -We have received your request to reset your {{ .CompanyName }} account password. +We have received your request to reset the password for your {{ .CompanyName }} account. Please click the button below to confirm your new password: -

{{ .MaskedPassword }}

(This can be replaced by the masked new password) - Confirm New Password This password reset confirmation link will expire in 60 minutes. Please let us know if you have any other questions! diff --git a/server/auth/internal/logic/userresettokenlogic.go b/server/auth/internal/logic/userresettokenlogic.go index b13eaa49..b7150b9a 100644 --- a/server/auth/internal/logic/userresettokenlogic.go +++ b/server/auth/internal/logic/userresettokenlogic.go @@ -62,16 +62,15 @@ func (l *UserResetTokenLogic) UserResetToken(req *types.RequestUserResetToken, u userName := *user.FirstName + " " + *user.LastName // 进入发送邮箱的系统 EmailManager.EmailTasks <- &EmailFormat{ - TemplateName: "reset_password.tpl", + TemplateName: "get_reset_password_html.tpl", UniqueKey: "reset_password-" + req.Email, TargetEmail: req.Email, CompanyName: "fusen", - ConfirmationLink: resetToken, // 跳转连接 + ConfirmationLink: l.svcCtx.Config.MainAddress + "/api/auth/reset/password/html?reset_token=" + resetToken, // 跳转连接 SenderName: "support@fusenpack.com", - SenderTitle: "register-valid", + SenderTitle: "reset password", Extend: map[string]string{ - "UserName": userName, - "ResetToken": resetToken, + "UserName": userName, }, } // email进入队