调整首页推荐排序算法

polaris1119 · polaris1119 · commit d7da874b4cf1 · 2019-08-18T23:42:27.000+08:00
diff --git a/cmd/studygolang/background.go b/cmd/studygolang/background.go
@@ -74,7 +74,7 @@ func ServeBackGround() {
 		c.AddFunc("@daily", logic.DefaultUserRich.AwardCooper)
 
 		// 首页推荐自动调整
-		c.AddFunc("@daily", logic.DefaultFeed.AutoUpdateSeq)
+		c.AddFunc("@every 5m", logic.DefaultFeed.AutoUpdateSeq)
 
 	}
 
diff --git a/logic/feed.go b/logic/feed.go
@@ -79,9 +79,16 @@ func (self FeedLogic) FindTop(ctx context.Context) []*model.Feed {
 	return self.fillOtherInfo(ctx, feeds, false)
 }
 
-// AutoUpdateSeq 每天自动更新一次动态的排序（校准）
+// AutoUpdateSeq 自动更新动态的排序（校准）
 func (self FeedLogic) AutoUpdateSeq() {
-	feedDay := config.ConfigFile.MustInt("feed", "day", 7)
+	curHour := time.Now().Hour()
+	if curHour < 7 {
+		return
+	}
+
+	feedDay := config.ConfigFile.MustInt("feed", "day", 3)
+	cmtWeight := config.ConfigFile.MustInt("feed", "cmt_weight", 80)
+	viewWeight := config.ConfigFile.MustInt("feed", "view_weight", 80)
 
 	var err error
 	offset, limit := 0, 100
@@ -99,7 +106,11 @@ func (self FeedLogic) AutoUpdateSeq() {
 				continue
 			}
 
+			// 当天（不到24小时）发布的，不降
 			elapse := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())
+			if elapse < 24 {
+				continue
+			}
 
 			if feed.Uid > 0 {
 				user := DefaultUser.FindOne(nil, "uid", feed.Uid)
@@ -110,7 +121,7 @@ func (self FeedLogic) AutoUpdateSeq() {
 
 			seq := 0
 			if elapse <= feedDay*24 {
-				seq = feed.Seq - elapse
+				seq = self.calcChangeSeq(feed, cmtWeight, viewWeight)
 			}
 
 			MasterDB.Table(new(model.Feed)).Where("id=?", feed.Id).Update(map[string]interface{}{
@@ -121,6 +132,54 @@ func (self FeedLogic) AutoUpdateSeq() {
 	}
 }
 
+func (self FeedLogic) calcChangeSeq(feed *model.Feed, cmtWeight int, viewWeight int) int {
+	seq := 0
+
+	// 最近有评论（时间更新）的，降 1/10 个评论数
+	if int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours()) < 1 {
+		seq = feed.Seq - cmtWeight/10
+	} else {
+		// 最近有没有其他变动（赞、阅读等）
+		var updatedAt time.Time
+		switch feed.Objtype {
+		case model.TypeTopic:
+			topicEx := &model.TopicEx{}
+			MasterDB.Where("tid=?", feed.Objid).Get(topicEx)
+			updatedAt = topicEx.Mtime
+		case model.TypeArticle:
+			article := &model.Article{}
+			MasterDB.ID(feed.Objid).Get(article)
+			updatedAt = time.Time(article.Mtime)
+		case model.TypeResource:
+			resourceEx := &model.ResourceEx{}
+			MasterDB.ID(feed.Objid).Get(resourceEx)
+			updatedAt = resourceEx.Mtime
+		case model.TypeProject:
+			project := &model.OpenProject{}
+			MasterDB.ID(feed.Objid).Get(project)
+			updatedAt = time.Time(project.Mtime)
+		case model.TypeBook:
+			book := &model.Book{}
+			MasterDB.ID(feed.Objid).Get(book)
+			updatedAt = time.Time(book.UpdatedAt)
+		}
+
+		dynamicElapse := int(time.Now().Sub(updatedAt).Hours())
+
+		if dynamicElapse < 1 {
+			seq = feed.Seq - viewWeight
+		} else {
+			seq = feed.Seq / 2
+		}
+	}
+
+	if seq < 20 {
+		seq = 20
+	}
+
+	return seq
+}
+
 func (FeedLogic) fillOtherInfo(ctx context.Context, feeds []*model.Feed, filterTop bool) []*model.Feed {
 	newFeeds := make([]*model.Feed, 0, len(feeds))
 
@@ -196,7 +255,7 @@ func (self FeedLogic) updateSeq(objid, objtype, cmtnum, likenum, viewnum int) {
 			return
 		}
 
-		feedDay := config.ConfigFile.MustInt("feed", "day", 7)
+		feedDay := config.ConfigFile.MustInt("feed", "day", 3)
 		elapse := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())
 
 		if feed.Uid > 0 {
diff --git a/model/feed.go b/model/feed.go
@@ -150,10 +150,10 @@ func PublishFeed(object interface{}, objectExt interface{}, me *Me) {
 		}
 	}
 
-	feedDay := config.ConfigFile.MustInt("feed", "day", 7)
+	feedDay := config.ConfigFile.MustInt("feed", "day", 3)
 	feed.Seq = feedDay * 24
 	if me != nil && me.IsAdmin {
-		feed.Seq += 100000
+		feed.Seq += 1000
 	}
 
 	_, err := db.MasterDB.Insert(feed)
diff --git a/model/resource.go b/model/resource.go
@@ -6,6 +6,8 @@
 
 package model
 
+import "time"
+
 const (
 	LinkForm    = "只是链接"
 	ContentForm = "包括内容"
@@ -41,11 +43,11 @@ func (this *Resource) BeforeInsert() {
 
 // 资源扩展（计数）信息
 type ResourceEx struct {
-	Id      int    `json:"-" xorm:"pk"`
-	Viewnum int    `json:"viewnum"`
-	Cmtnum  int    `json:"cmtnum"`
-	Likenum int    `json:"likenum"`
-	Mtime   string `json:"mtime" xorm:"<-"`
+	Id      int       `json:"-" xorm:"pk"`
+	Viewnum int       `json:"viewnum"`
+	Cmtnum  int       `json:"cmtnum"`
+	Likenum int       `json:"likenum"`
+	Mtime   time.Time `json:"mtime" xorm:"<-"`
 }
 
 type ResourceInfo struct {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func ServeBackGround() {`
`74`	`74`	`c.AddFunc("@daily", logic.DefaultUserRich.AwardCooper)`
`75`	`75`
`76`	`76`	`// 首页推荐自动调整`
`77`		`- c.AddFunc("@daily", logic.DefaultFeed.AutoUpdateSeq)`
	`77`	`+ c.AddFunc("@every 5m", logic.DefaultFeed.AutoUpdateSeq)`
`78`	`78`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,10 @@ func PublishFeed(object interface{}, objectExt interface{}, me *Me) {`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- feedDay := config.ConfigFile.MustInt("feed", "day", 7)`
	`153`	`+ feedDay := config.ConfigFile.MustInt("feed", "day", 3)`
`154`	`154`	`feed.Seq = feedDay * 24`
`155`	`155`	`if me != nil && me.IsAdmin {`
`156`		`- feed.Seq += 100000`
	`156`	`+ feed.Seq += 1000`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`_, err := db.MasterDB.Insert(feed)`