用户一个月内发完邮件

zhima1234 · zhima1234 · commit b781d93ca5aa · 2017-06-17T16:14:35.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,5 @@ welcome.png
 
 *.json
 
-.DS_Store
+.DS_Store
+/env.ini
diff --git a/src/logic/email.go b/src/logic/email.go
@@ -170,6 +170,9 @@ func (self EmailLogic) EmailNotice() {
 		users   = make([]*model.User, 0)
 	)
 
+	day := time.Now().Day()
+	monthDayNum := util.MonthDayNum(time.Now())
+
 	for {
 		err = MasterDB.Where("uid>?", lastUid).Asc("uid").Limit(limit).Find(&users)
 		if err != nil {
@@ -186,6 +189,10 @@ func (self EmailLogic) EmailNotice() {
 				lastUid = user.Uid
 			}
 
+			if user.Uid%monthDayNum != day {
+				continue
+			}
+
 			if user.Unsubscribe == 1 {
 				logger.Infoln("user unsubscribe", user)
 				continue
@@ -208,7 +215,7 @@ func (self EmailLogic) EmailNotice() {
 			self.SendMail("每周精选", content, []string{user.Email})
 
 			// 控制发信速度
-			time.Sleep(2 * time.Second)
+			time.Sleep(60 * time.Second)
 		}
 
 		users = make([]*model.User, 0)
diff --git a/src/server/studygolang/background.go b/src/server/studygolang/background.go
@@ -57,7 +57,7 @@ func ServeBackGround() {
 			c.AddFunc("@daily", logic.GenSitemap)
 
 			// 给用户发邮件，如通知网站最近的动态，每周的晨读汇总等
-			c.AddFunc("0 0 4 * * 1", logic.DefaultEmail.EmailNotice)
+			c.AddFunc("0 0 0 * * *", logic.DefaultEmail.EmailNotice)
 		}
 
 		// 每天对活跃用户奖励铜币
diff --git a/src/util/time.go b/src/util/time.go
@@ -0,0 +1,33 @@
+// Copyright 2017 The StudyGolang Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+// http://studygolang.com
+// Author: polaris	polaris@studygolang.com
+
+package util
+
+import "time"
+
+// MonthDayNum t 所在时间的月份总天数
+func MonthDayNum(t time.Time) int {
+	isLeapYear := isLeap(t.Year())
+
+	month := t.Month()
+	switch month {
+	case time.January, time.March, time.May, time.July, time.August, time.October, time.December:
+		return 31
+	case time.February:
+		if isLeapYear {
+			return 29
+		}
+
+		return 28
+	default:
+		return 30
+	}
+}
+
+// 是否闰年
+func isLeap(year int) bool {
+	return year%4 == 0 && (year%100 != 0 || year%400 == 0)
+}
diff --git a/src/vendor/manifest b/src/vendor/manifest
@@ -311,7 +311,7 @@
 		{
 			"importpath": "github.com/polaris1119/nosql",
 			"repository": "https://github.com/polaris1119/nosql",
-			"revision": "182e26aeeef42c383b9eb2d809f07c7f723cb403",
+			"revision": "f62516f53b5a1d584c925e364938d404ada94f4d",
 			"branch": "master"
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func ServeBackGround() {`
`57`	`57`	`c.AddFunc("@daily", logic.GenSitemap)`
`58`	`58`
`59`	`59`	`// 给用户发邮件，如通知网站最近的动态，每周的晨读汇总等`
`60`		`- c.AddFunc("0 0 4 * * 1", logic.DefaultEmail.EmailNotice)`
	`60`	`+ c.AddFunc("0 0 0 * * *", logic.DefaultEmail.EmailNotice)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`// 每天对活跃用户奖励铜币`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@`
`311`	`311`	`{`
`312`	`312`	`"importpath": "github.com/polaris1119/nosql",`
`313`	`313`	`"repository": "https://github.com/polaris1119/nosql",`
`314`		`- "revision": "182e26aeeef42c383b9eb2d809f07c7f723cb403",`
	`314`	`+ "revision": "f62516f53b5a1d584c925e364938d404ada94f4d",`
`315`	`315`	`"branch": "master"`
`316`	`316`	`},`
`317`	`317`	`{`