email modify
This commit is contained in:
parent
3e88fd2d5e
commit
96c2bf3941
@ -35,14 +35,19 @@ type Email struct {
|
||||
BodyMsg string `json:"_"`
|
||||
}
|
||||
|
||||
func NewEmail(member *member.Member, subject string) *Email {
|
||||
func NewEmail(id json.Number, email string, companyName string, memberName string, subject string) *Email {
|
||||
|
||||
if subject == "" {
|
||||
subject = SUBJECT
|
||||
}
|
||||
|
||||
return &Email{
|
||||
Member: member,
|
||||
Member: &member.Member{
|
||||
Id: id,
|
||||
Email: email,
|
||||
CompanyName: companyName,
|
||||
Name: memberName,
|
||||
},
|
||||
From: FROM,
|
||||
Subj: subject,
|
||||
SmtpServer: SERVER_NAME,
|
||||
@ -50,7 +55,6 @@ func NewEmail(member *member.Member, subject string) *Email {
|
||||
}
|
||||
|
||||
type EmailService struct {
|
||||
email *Email
|
||||
}
|
||||
|
||||
func NewEmailService() *EmailService {
|
||||
@ -84,11 +88,6 @@ func (es *EmailService) getSendMailMessage(e *Email) string {
|
||||
return message
|
||||
}
|
||||
|
||||
func (es *EmailService) SetEmail(m *member.Member, sub string) {
|
||||
e := NewEmail(m, sub)
|
||||
es.email = e
|
||||
}
|
||||
|
||||
func (es *EmailService) generationAuthToken(e *Email) string {
|
||||
var tempToken string
|
||||
|
||||
|
@ -1,32 +1,26 @@
|
||||
package email
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"git.loafle.net/overflow/overflow_service/proxy/member"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func getEmailObj() (*Email, *EmailService) {
|
||||
es := NewEmailService()
|
||||
m := &member.Member{
|
||||
Email: "geek@loafle.com",
|
||||
Name: "geek",
|
||||
CompanyName: "loafle",
|
||||
Id: json.Number("2"),
|
||||
}
|
||||
e := NewEmail(m, "Hello Oveflow")
|
||||
//m := &member.Member{
|
||||
// Email: "geek@loafle.com",
|
||||
// Name: "geek",
|
||||
// CompanyName: "loafle",
|
||||
// Id: json.Number("2"),
|
||||
//}
|
||||
//e := NewEmail(m, "Hello Oveflow")
|
||||
e := NewEmail("1", "geek@loafle.com", "loafle", "geek", "")
|
||||
|
||||
return e, es
|
||||
}
|
||||
|
||||
func TestNewEmail(t *testing.T) {
|
||||
e := NewEmail(&member.Member{
|
||||
Email: "geek@loafle.com",
|
||||
Name: "geek",
|
||||
CompanyName: "loafle",
|
||||
Id: json.Number("2"),
|
||||
},"")
|
||||
e := NewEmail("1", "geek@loafle.com", "loafle", "geek", "")
|
||||
|
||||
t.Log(e.Member.Email)
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user