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

fs_template/email_register_oauth2.tpl

@@ -11,7 +11,7 @@ From: "Fusen Support"
 
 <p>Thank you for choosing {{ .CompanyName }}. To complete the account setup process, please click the button below to confirm your email address:</p>
 
-<a href="{{ .ConfirmationLink }}" target="_blank" style="background-color: #008CBA; color: #FFFFFF; text-decoration: none; padding: 10px 15px; border-radius: 3px; display:inline-block; font-weight: bold;">Confirm Email: {{ .UserName }}</a>
+<a href="{{ .ConfirmationLink }}" target="_blank" style="background-color: #008CBA; color: #FFFFFF; text-decoration: none; padding: 10px 15px; border-radius: 3px; display:inline-block; font-weight: bold;">Confirm Email: {{ .Email }}</a>
 
 <p>Confirming your email ensures your account is properly secured. This also allows you to access member-only tools and content.</p>
 

model/gmodel/fs_user_logic.go

@@ -92,7 +92,7 @@ func InheritGuestIdResource(tx *gorm.DB, userId, guestId int64, afterDo func(txR
 		}
 		return afterDo(txRes, txUserMaterial, txUserInfo)
 	}
-	return fmt.Errorf("guest_id must not be 0")
+	return nil
 }
 
 // 谷歌平台的注册流程
@@ -128,7 +128,7 @@ func (u *FsUserModel) RegisterByGoogleOAuth(ctx context.Context, token *auth.Reg
 
 		// 如果已经存在,把谷歌id 加入到用户信息里
 		user.GoogleId = &googleId
-		return tx.Model(&FsUser{}).Where("id = ?", user.Id).Update("google_id", user).Error
+		return tx.Model(&FsUser{}).Where("id = ?", user.Id).Update("google_id", googleId).Error
 	})
 
 	if err != nil {

server/auth/internal/logic/useremailregisterlogic.go

@@ -91,6 +91,7 @@ func (l *UserEmailRegisterLogic) UserEmailRegister(req *types.RequestEmailRegist
 		SenderTitle:      "register-valid",
 		Extend: map[string]string{
 			"UserName": userName,
+			"Email":    req.Email,
 		},
 	} // email进入队