From 2a31906da4a03af62412b76ab680271a81cfe636 Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 6 Sep 2023 18:47:07 +0800
Subject: [PATCH] fix

---
 fs_template/email_register_oauth2.tpl                | 2 +-
 server/auth/internal/logic/useremailregisterlogic.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs_template/email_register_oauth2.tpl b/fs_template/email_register_oauth2.tpl
index 892bf3df..39cef6d6 100644
--- a/fs_template/email_register_oauth2.tpl
+++ b/fs_template/email_register_oauth2.tpl
@@ -9,7 +9,7 @@ From: "Fusen Support"
 
 <p>Dear <span style="color: red;">{{.UserName}}</span>,</p>
 
-<p>Thank you for choosing to associate your email address with your {{ .CompanyName }} account({{ .PlatformAndID }}) . To complete the process, please click the button below to confirm your email:</p>
+<p>Thank you for choosing to associate your email address with your {{ .CompanyName }} account {{ .PlatformAndID }}. To complete the process, please click the button below to confirm your email:</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: {{ .Email }}</a>
 
diff --git a/server/auth/internal/logic/useremailregisterlogic.go b/server/auth/internal/logic/useremailregisterlogic.go
index 180d0900..aaedb782 100644
--- a/server/auth/internal/logic/useremailregisterlogic.go
+++ b/server/auth/internal/logic/useremailregisterlogic.go
@@ -81,9 +81,9 @@ func (l *UserEmailRegisterLogic) UserEmailRegister(req *types.RequestEmailRegist
 	}
 
 	userName := token.Extend["first_name"].(string) + " " + token.Extend["last_name"].(string)
-	var platformAndId string
+	var platformAndID string
 	if oauthId, ok := token.Extend["oauth_id"]; ok {
-		platformAndId = token.Platform + " Id: " + oauthId.(string)
+		platformAndID = token.Platform + " Id: " + oauthId.(string)
 	}
 
 	// 进入发送邮箱的系统
@@ -98,7 +98,7 @@ func (l *UserEmailRegisterLogic) UserEmailRegister(req *types.RequestEmailRegist
 		Extend: map[string]string{
 			"UserName":      userName,
 			"Email":         req.Email,
-			"PlatformAndID": platformAndId,
+			"PlatformAndID": platformAndID,
 		},
 	} // email进入队