From 67230a58bf3aaffaae7259eea5ba4ba912bf99df Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Wed, 6 Sep 2023 12:29:34 +0800
Subject: [PATCH] fix
---
fs_template/email_register_oauth2.tpl | 27 +++++++++++++++++++
model/gmodel/fs_user_logic.go | 2 +-
.../internal/logic/useremailregisterlogic.go | 9 ++++++-
3 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 fs_template/email_register_oauth2.tpl
diff --git a/fs_template/email_register_oauth2.tpl b/fs_template/email_register_oauth2.tpl
new file mode 100644
index 00000000..85ed4fab
--- /dev/null
+++ b/fs_template/email_register_oauth2.tpl
@@ -0,0 +1,27 @@
+Subject: Please confirm your {{ .CompanyName }} account
+MIME-version: 1.0
+Content-Type: text/html; charset="UTF-8"
+From: "Fusen Support"
+
+
+
+
+
+Dear {{.UserName}},
+
+Thank you for choosing {{ .CompanyName }}. To complete the account setup process, please click the button below to confirm your email address:
+
+Confirm Email: {{ .UserName }}
+
+Confirming your email ensures your account is properly secured. This also allows you to access member-only tools and content.
+
+If you did not initiate this request or have any questions, please disregard this email. Your account will not be activated.
+
+Regards,
+
+{{.SenderName}}
+{{.SenderTitle}}
+{{.CompanyName}}
+
+
+
\ No newline at end of file
diff --git a/model/gmodel/fs_user_logic.go b/model/gmodel/fs_user_logic.go
index 05e3dabf..09ee122d 100644
--- a/model/gmodel/fs_user_logic.go
+++ b/model/gmodel/fs_user_logic.go
@@ -128,7 +128,7 @@ func (u *FsUserModel) RegisterByGoogleOAuth(ctx context.Context, token *auth.Reg
// 如果已经存在,把谷歌id 加入到用户信息里
user.GoogleId = &googleId
- return tx.Model(&FsUser{}).Update("google_id", user).Error
+ return tx.Model(&FsUser{}).Where("id = ?", user.Id).Update("google_id", user).Error
})
if err != nil {
diff --git a/server/auth/internal/logic/useremailregisterlogic.go b/server/auth/internal/logic/useremailregisterlogic.go
index 9511b9ca..8c7c1c38 100644
--- a/server/auth/internal/logic/useremailregisterlogic.go
+++ b/server/auth/internal/logic/useremailregisterlogic.go
@@ -72,10 +72,17 @@ func (l *UserEmailRegisterLogic) UserEmailRegister(req *types.RequestEmailRegist
return resp.SetStatus(basic.CodeOAuthRegisterTokenErr)
}
+ var tplsel string = "email_register.tpl"
+ if token.Platform == auth.PLATFORM_FUSEN {
+ tplsel = "email_register.tpl"
+ } else {
+ tplsel = "email_register_oauth2.tpl"
+ }
+
userName := token.Extend["first_name"].(string) + " " + token.Extend["last_name"].(string)
// 进入发送邮箱的系统
EmailManager.EmailTasks <- &EmailFormat{
- TemplateName: "email_register.tpl",
+ TemplateName: tplsel,
UniqueKey: "register-" + req.Email,
TargetEmail: req.Email,
CompanyName: "fusen",