From 8e95bfb98712ce57ede7e133b5c9404f14b0d08a Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Tue, 5 Sep 2023 18:32:19 +0800 Subject: [PATCH 1/3] fix --- server/auth/internal/logic/email_manager.go | 1 + server/auth/internal/logic/websocket_test.go | 94 ++------------------ 2 files changed, 6 insertions(+), 89 deletions(-) diff --git a/server/auth/internal/logic/email_manager.go b/server/auth/internal/logic/email_manager.go index 3c95563c..15ac3c0c 100644 --- a/server/auth/internal/logic/email_manager.go +++ b/server/auth/internal/logic/email_manager.go @@ -222,6 +222,7 @@ func RenderEmailTemplate(templateName, companyName, confirmationLink, senderName } var result bytes.Buffer + result.Write([]byte("MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n")) err := tpls.ExecuteTemplate(&result, templateName, data) if err != nil { log.Fatal(err) diff --git a/server/auth/internal/logic/websocket_test.go b/server/auth/internal/logic/websocket_test.go index 69d779a6..2ebc4044 100644 --- a/server/auth/internal/logic/websocket_test.go +++ b/server/auth/internal/logic/websocket_test.go @@ -28,97 +28,13 @@ func TestEmailSend(t *testing.T) { auth := smtp.PlainAuth("", "support@fusenpack.com", "wfbjpdgvaozjvwah", smtpServer) - body := `
-
-
-
-
-
-
- -
-
- - - - - - - - -
-
- -
- 		-
- 3e -
-
- 474420502@qq.com -
-
- -
- -
-
-   -
-
- -
-
-
-
-
-
-
- ------------------ 原始邮件 ------------------ -
-
-
- - 发件人: - - "support" <support@fusenpack.com>; -
-
- - 发送时间: - -  2023年9月5日(星期二) 晚上6:16 -
-
- - 收件人: - -  "3e"<474420502@qq.com>; - -
-
-
-
- - 主题: - -  Simple Mail -
-
-
-
-
- - -
` - // 构建邮件内容 - message := []byte("To: " + to[0] + "\r\n" + - "Subject: Simple Mail\r\n" + - "\r\n" + - body) + subject := "Subject: Test email from Go!\n" + mime := "MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n" + body := "

Hello World!

" + msg := []byte(subject + mime + body) // 发送邮件 - err := smtp.SendMail(smtpServer+":587", auth, from, to, message) + err := smtp.SendMail(smtpServer+":587", auth, from, to, msg) if err != nil { log.Fatal(err) } From 67bd956b6e8893901cbd0f11370da471110587a3 Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Tue, 5 Sep 2023 18:35:10 +0800 Subject: [PATCH 2/3] fix --- fs_template/email_register.tpl | 4 ++++ fs_template/get_reset_password_html.tpl | 4 ++++ server/auth/internal/logic/email_manager.go | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/fs_template/email_register.tpl b/fs_template/email_register.tpl index c5b8cb2a..e88553c5 100644 --- a/fs_template/email_register.tpl +++ b/fs_template/email_register.tpl @@ -1,5 +1,9 @@ Subject: Please confirm your {{ .CompanyName }} account +MIME-version: 1.0; +Content-Type: text/html; +charset=\"UTF-8\"; + Dear {{ .UserName }}, Thank you for registering an account with {{ .CompanyName }}. We are thrilled to have you join our community! diff --git a/fs_template/get_reset_password_html.tpl b/fs_template/get_reset_password_html.tpl index 4cd78739..d9eaa6d7 100644 --- a/fs_template/get_reset_password_html.tpl +++ b/fs_template/get_reset_password_html.tpl @@ -1,5 +1,9 @@ Subject: Password Reset Request for Your {{ .CompanyName }} Account +MIME-version: 1.0; +Content-Type: text/html; +charset=\"UTF-8\"; + Dear {{ .UserName }}, We have received your request to reset the password for your {{ .CompanyName }} account. diff --git a/server/auth/internal/logic/email_manager.go b/server/auth/internal/logic/email_manager.go index 15ac3c0c..4d1bd84a 100644 --- a/server/auth/internal/logic/email_manager.go +++ b/server/auth/internal/logic/email_manager.go @@ -222,7 +222,7 @@ func RenderEmailTemplate(templateName, companyName, confirmationLink, senderName } var result bytes.Buffer - result.Write([]byte("MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n")) + // result.Write([]byte("MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n")) err := tpls.ExecuteTemplate(&result, templateName, data) if err != nil { log.Fatal(err) From 5671ada373585aa7d9c307d27029bf2e6084ff20 Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Tue, 5 Sep 2023 18:38:15 +0800 Subject: [PATCH 3/3] fix --- fs_template/email_register.tpl | 4 ---- fs_template/get_reset_password_html.tpl | 4 ---- server/auth/internal/logic/email_manager.go | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/fs_template/email_register.tpl b/fs_template/email_register.tpl index e88553c5..c5b8cb2a 100644 --- a/fs_template/email_register.tpl +++ b/fs_template/email_register.tpl @@ -1,9 +1,5 @@ Subject: Please confirm your {{ .CompanyName }} account -MIME-version: 1.0; -Content-Type: text/html; -charset=\"UTF-8\"; - Dear {{ .UserName }}, Thank you for registering an account with {{ .CompanyName }}. We are thrilled to have you join our community! diff --git a/fs_template/get_reset_password_html.tpl b/fs_template/get_reset_password_html.tpl index d9eaa6d7..4cd78739 100644 --- a/fs_template/get_reset_password_html.tpl +++ b/fs_template/get_reset_password_html.tpl @@ -1,9 +1,5 @@ Subject: Password Reset Request for Your {{ .CompanyName }} Account -MIME-version: 1.0; -Content-Type: text/html; -charset=\"UTF-8\"; - Dear {{ .UserName }}, We have received your request to reset the password for your {{ .CompanyName }} account. diff --git a/server/auth/internal/logic/email_manager.go b/server/auth/internal/logic/email_manager.go index 4d1bd84a..15ac3c0c 100644 --- a/server/auth/internal/logic/email_manager.go +++ b/server/auth/internal/logic/email_manager.go @@ -222,7 +222,7 @@ func RenderEmailTemplate(templateName, companyName, confirmationLink, senderName } var result bytes.Buffer - // result.Write([]byte("MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n")) + result.Write([]byte("MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n")) err := tpls.ExecuteTemplate(&result, templateName, data) if err != nil { log.Fatal(err)