From c72c40fcd32b26fc5684246051532cc21c2346c7 Mon Sep 17 00:00:00 2001 From: Evan Chen Date: Tue, 25 Jan 2022 23:33:48 +0800 Subject: [PATCH] update --- auth/user.go | 2 +- calendar/calendar.go | 2 -- calendar/event_group.go | 2 -- email/email_test.go | 9 +++++++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/auth/user.go b/auth/user.go index c73cb69..b4bca17 100644 --- a/auth/user.go +++ b/auth/user.go @@ -46,7 +46,7 @@ func (u *User) BeforeCreate(tx *gorm.DB) (err error) { if u.ID == "" { u.ID = xid.New().String() } - u.Activated = true + // u.Activated = true u.LastLogin = time.Now() u.LoginFailed = 0 return diff --git a/calendar/calendar.go b/calendar/calendar.go index 5876f18..dca7825 100644 --- a/calendar/calendar.go +++ b/calendar/calendar.go @@ -47,8 +47,6 @@ func (c *Calendar) BeforeSave(tx *gorm.DB) (err error) { return errors.ErrorNotFound } c.GroupID = grp_id - } else { - c.GroupID = 0 } return } diff --git a/calendar/event_group.go b/calendar/event_group.go index 47ef90a..dbb2f25 100644 --- a/calendar/event_group.go +++ b/calendar/event_group.go @@ -45,8 +45,6 @@ func (eg *EventGroup) BeforeSave(tx *gorm.DB) (err error) { return errors.ErrorNotFound } eg.GroupID = grp_id - } else { - eg.GroupID = 0 } return diff --git a/email/email_test.go b/email/email_test.go index a46ffb6..ec2e810 100644 --- a/email/email_test.go +++ b/email/email_test.go @@ -2,6 +2,8 @@ package email import ( "testing" + + "gopkg.in/gomail.v2" ) func TestSendSimple(t *testing.T) { @@ -72,8 +74,11 @@ func TestSend(t *testing.T) { } func TestMaintain(t *testing.T) { setupDefault() - err := Send("test@kumoly.io", - []string{"test@kumoly.io"}, "TestMaintain", + // dial = &gomail.Dialer{Host: "localhost", Port: 25, SSL: false} + dial = gomail.NewDialer("smtp.gmail.com", 587, "rd.trac@arec.com", "hlllzqcfsedrqeul") + + err := Send("rd.trac@arec.com", + []string{"evanchen333@gmail.com"}, "TestMaintain", &Body{ Greeting: "您好", Receiver: "管理員",