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

server/auth/internal/handler/routes.go

@@ -53,7 +53,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: UserResetPasswordHandler(serverCtx),
 			},
 			{
-				Method:  http.MethodPost,
+				Method:  http.MethodGet,
 				Path:    "/api/auth/reset/password/html",
 				Handler: UserResetPasswordHtmlHandler(serverCtx),
 			},

server/auth/internal/logic/email_manager.go

@@ -34,7 +34,7 @@ func init() {
 	EmailManager = &EmailSender{
 		EmailTasks: make(chan *EmailFormat, 10),
 		Auth: smtp.PlainAuth(
-			"",
+			"fusen support",
 			"support@fusenpack.com",
 			"wfbjpdgvaozjvwah",
 			"smtp.gmail.com",
@@ -179,7 +179,6 @@ func (m *EmailSender) Resend(uniqueKey string, content []byte) {
 
 	m.lock.Lock()
 	defer m.lock.Unlock()
-
 	// Check if the email task still exists and has not been sent successfully
 	if task, ok := m.emailSending[uniqueKey]; ok && task.SendTime.Add(m.ResendTimeLimit).After(time.Now().UTC()) {
 		err := smtp.SendMail(task.Email.TargetEmail, m.Auth, m.FromEmail, []string{task.Email.TargetEmail}, content)

server/auth/internal/logic/userresetpasswordlogic.go

@@ -55,9 +55,10 @@ func (l *UserResetPasswordLogic) UserResetPassword(req *types.RequestUserResetPa
 	}
 
 	err = l.svcCtx.AllModels.FsUser.Transaction(l.ctx, func(tx *gorm.DB) error {
-		user := &gmodel.FsUser{Id: int64(rt.UserId)}
-		err := tx.Take(user).Error
+		user := &gmodel.FsUser{}
+		err := tx.Model(user).Where("id = ?", rt.UserId).Take(user).Error
 		if err != nil {
+			logx.Error(err)
 			return err
 		}
 		if *user.PasswordHash != rt.OldPassword {
@@ -67,6 +68,7 @@ func (l *UserResetPasswordLogic) UserResetPassword(req *types.RequestUserResetPa
 	})
 
 	if err != nil {
+		logx.Error(err)
 		return resp.SetStatus(basic.CodeDbSqlErr, err.Error())
 	}
 

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进入队
 

server/auth/internal/types/types.go

@@ -37,7 +37,7 @@ type DataResetToken struct {
 }
 
 type RequestUserResetHtml struct {
-	ResetToken string `json:"reset_token"`
+	ResetToken string `form:"reset_token"`
 }
 
 type RequestUserResetPassword struct {