排序 bugfix

polaris1119 · polaris1119 · commit fd3bd935ceb1 · 2019-08-14T09:14:13.000+08:00
diff --git a/docs/qiniu.md b/docs/qiniu.md
@@ -2,6 +2,6 @@ Go 中文网静态资源托管在七牛云上，对于 js 和 css，如果有变
 
 按文档安装完后，需要设置 account，之后执行类似如下命令来替换 js 或 css：
 
-qshell fput studygolang static/dist/js/sg_base.min.js dist/js/sg_base.min.js true
+qshell fput studygolang static/dist/js/sg_base.min.js dist/js/sg_base.min.js -w
 
 即：qshell fput <Bucket> <Key> <LocalFile> [<Overwrite>]
diff --git a/logic/feed.go b/logic/feed.go
@@ -99,21 +99,24 @@ func (self FeedLogic) AutoUpdateSeq() {
 				continue
 			}
 
-			elaspe := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())
+			elapse := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())
 
 			if feed.Uid > 0 {
 				user := DefaultUser.FindOne(nil, "uid", feed.Uid)
 				if DefaultUser.IsAdmin(user) {
-					elaspe = int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours())
+					elapse = int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours())
 				}
 			}
 
-			if elaspe > feedDay*24 {
-				MasterDB.Table(new(model.Feed)).Where("id=?", feed.Id).Update(map[string]interface{}{
-					"updated_at": time.Time(feed.UpdatedAt),
-					"seq":        0,
-				})
+			seq := 0
+			if elapse <= feedDay*24 {
+				seq = feed.Seq - elapse
 			}
+
+			MasterDB.Table(new(model.Feed)).Where("id=?", feed.Id).Update(map[string]interface{}{
+				"updated_at": time.Time(feed.UpdatedAt),
+				"seq":        seq,
+			})
 		}
 	}
 }
@@ -190,26 +193,26 @@ func (self FeedLogic) updateSeq(objid, objtype, cmtnum, likenum, viewnum int) {
 		}
 
 		feedDay := config.ConfigFile.MustInt("global", "feed_day", 7)
-		elaspe := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())
+		elapse := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())
 
 		if feed.Uid > 0 {
 			user := DefaultUser.FindOne(nil, "uid", feed.Uid)
 			if DefaultUser.IsAdmin(user) {
-				elaspe = int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours())
+				elapse = int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours())
 			}
 		}
 
 		seq := 0
 
-		if elaspe > feedDay*24 {
+		if elapse > feedDay*24 {
 			if feed.Seq == 0 {
 				return
 			}
 		} else {
 			if feed.Seq == 0 {
-				seq = elaspe + (feed.Cmtnum+cmtnum)*100 + likenum*100 + viewnum*5
+				seq = feedDay*24 - elapse + (feed.Cmtnum+cmtnum)*100 + likenum*100 + viewnum*5
 			} else {
-				seq = feed.Seq - elaspe + cmtnum*100 + likenum*100 + viewnum*5
+				seq = feed.Seq + cmtnum*100 + likenum*100 + viewnum*5
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -99,21 +99,24 @@ func (self FeedLogic) AutoUpdateSeq() {`
`99`	`99`	`continue`
`100`	`100`	`}`
`101`	`101`
`102`		`- elaspe := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())`
	`102`	`+ elapse := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())`
`103`	`103`
`104`	`104`	`if feed.Uid > 0 {`
`105`	`105`	`user := DefaultUser.FindOne(nil, "uid", feed.Uid)`
`106`	`106`	`if DefaultUser.IsAdmin(user) {`
`107`		`- elaspe = int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours())`
	`107`	`+ elapse = int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours())`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`- if elaspe > feedDay*24 {`
`112`		`- MasterDB.Table(new(model.Feed)).Where("id=?", feed.Id).Update(map[string]interface{}{`
`113`		`- "updated_at": time.Time(feed.UpdatedAt),`
`114`		`- "seq": 0,`
`115`		`- })`
	`111`	`+ seq := 0`
	`112`	`+ if elapse <= feedDay*24 {`
	`113`	`+ seq = feed.Seq - elapse`
`116`	`114`	`}`
	`115`	`+`
	`116`	`+ MasterDB.Table(new(model.Feed)).Where("id=?", feed.Id).Update(map[string]interface{}{`
	`117`	`+ "updated_at": time.Time(feed.UpdatedAt),`
	`118`	`+ "seq": seq,`
	`119`	`+ })`
`117`	`120`	`}`
`118`	`121`	`}`
`119`	`122`	`}`
`@@ -190,26 +193,26 @@ func (self FeedLogic) updateSeq(objid, objtype, cmtnum, likenum, viewnum int) {`
`190`	`193`	`}`
`191`	`194`
`192`	`195`	`feedDay := config.ConfigFile.MustInt("global", "feed_day", 7)`
`193`		`- elaspe := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())`
	`196`	`+ elapse := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())`
`194`	`197`
`195`	`198`	`if feed.Uid > 0 {`
`196`	`199`	`user := DefaultUser.FindOne(nil, "uid", feed.Uid)`
`197`	`200`	`if DefaultUser.IsAdmin(user) {`
`198`		`- elaspe = int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours())`
	`201`	`+ elapse = int(time.Now().Sub(time.Time(feed.UpdatedAt)).Hours())`
`199`	`202`	`}`
`200`	`203`	`}`
`201`	`204`
`202`	`205`	`seq := 0`
`203`	`206`
`204`		`- if elaspe > feedDay*24 {`
	`207`	`+ if elapse > feedDay*24 {`
`205`	`208`	`if feed.Seq == 0 {`
`206`	`209`	`return`
`207`	`210`	`}`
`208`	`211`	`} else {`
`209`	`212`	`if feed.Seq == 0 {`
`210`		`- seq = elaspe + (feed.Cmtnum+cmtnum)100 + likenum100 + viewnum*5`
	`213`	`+ seq = feedDay24 - elapse + (feed.Cmtnum+cmtnum)100 + likenum100 + viewnum5`
`211`	`214`	`} else {`
`212`		`- seq = feed.Seq - elaspe + cmtnum100 + likenum100 + viewnum*5`
	`215`	`+ seq = feed.Seq + cmtnum100 + likenum100 + viewnum*5`
`213`	`216`	`}`
`214`	`217`	`}`
`215`	`218`