图片上传失败

polaris1119 · polaris1119 · commit 057b49d2e3b7 · 2019-08-14T21:38:35.000+08:00
diff --git a/logic/article.go b/logic/article.go
@@ -846,7 +846,7 @@ func (self ArticleLogic) MoveToTopic(ctx context.Context, id interface{}, me *mo
 	DefaultUserRich.IncrUserRich(user, model.MissionTypePunish, award, desc)
 
 	// 将文章删除
-	_, err = session.Id(article.Id).Delete(article)
+	_, err = session.ID(article.Id).Delete(article)
 
 	session.Commit()
 
diff --git a/logic/common.go b/logic/common.go
@@ -70,6 +70,10 @@ func CanEdit(me *model.Me, curModel interface{}) bool {
 		return false
 	}
 
+	if me.IsRoot {
+		return true
+	}
+
 	canEditTime := time.Duration(UserSetting[model.KeyCanEditTime]) * time.Second
 	switch entity := curModel.(type) {
 	case *model.Topic:
diff --git a/logic/feed.go b/logic/feed.go
@@ -81,7 +81,7 @@ func (self FeedLogic) FindTop(ctx context.Context) []*model.Feed {
 
 // AutoUpdateSeq 每天自动更新一次动态的排序（校准）
 func (self FeedLogic) AutoUpdateSeq() {
-	feedDay := config.ConfigFile.MustInt("global", "feed_day", 7)
+	feedDay := config.ConfigFile.MustInt("feed", "day", 7)
 
 	var err error
 	offset, limit := 0, 100
@@ -181,6 +181,10 @@ func (FeedLogic) publish(object interface{}, objectExt interface{}, me *model.Me
 }
 
 func (self FeedLogic) updateSeq(objid, objtype, cmtnum, likenum, viewnum int) {
+	cmtWeight := config.ConfigFile.MustInt("feed", "cmt_weight", 80)
+	likeWeight := config.ConfigFile.MustInt("feed", "like_weight", 60)
+	viewWeight := config.ConfigFile.MustInt("feed", "view_weight", 5)
+
 	go func() {
 		feed := &model.Feed{}
 		_, err := MasterDB.Where("objid=? AND objtype=?", objid, objtype).Get(feed)
@@ -192,7 +196,7 @@ func (self FeedLogic) updateSeq(objid, objtype, cmtnum, likenum, viewnum int) {
 			return
 		}
 
-		feedDay := config.ConfigFile.MustInt("global", "feed_day", 7)
+		feedDay := config.ConfigFile.MustInt("feed", "day", 7)
 		elapse := int(time.Now().Sub(time.Time(feed.CreatedAt)).Hours())
 
 		if feed.Uid > 0 {
@@ -210,9 +214,9 @@ func (self FeedLogic) updateSeq(objid, objtype, cmtnum, likenum, viewnum int) {
 			}
 		} else {
 			if feed.Seq == 0 {
-				seq = feedDay*24 - elapse + (feed.Cmtnum+cmtnum)*100 + likenum*100 + viewnum*5
+				seq = feedDay*24 - elapse + (feed.Cmtnum+cmtnum)*cmtWeight + likenum*likeWeight + viewnum*viewWeight
 			} else {
-				seq = feed.Seq + cmtnum*100 + likenum*100 + viewnum*5
+				seq = feed.Seq + cmtnum*cmtWeight + likenum*likeWeight + viewnum*viewWeight
 			}
 		}
 
diff --git a/logic/uploader.go b/logic/uploader.go
@@ -23,11 +23,11 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/net/context"
+
 	. "github.com/studygolang/studygolang/db"
 	"github.com/studygolang/studygolang/model"
 
-	"golang.org/x/net/context"
-
 	"github.com/polaris1119/config"
 	"github.com/polaris1119/goutils"
 	"github.com/polaris1119/logger"
@@ -197,7 +197,10 @@ func (this *UploaderLogic) TransferUrl(ctx context.Context, origUrl string, pref
 	}
 	defer resp.Body.Close()
 
-	buf, _ := ioutil.ReadAll(resp.Body)
+	buf, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return origUrl, errors.New("获取图片内容失败")
+	}
 
 	md5 := goutils.Md5Buf(buf)
 	objImage, err := this.findImage(md5)
@@ -213,12 +216,19 @@ func (this *UploaderLogic) TransferUrl(ctx context.Context, origUrl string, pref
 	ext := filepath.Ext(origUrl)
 	if ext == "" {
 		contentType := http.DetectContentType(buf)
-		exts, _ := mime.ExtensionsByType(contentType)
-		if len(exts) > 0 {
+		exts, err := mime.ExtensionsByType(contentType)
+		if err != nil {
+			logger.Errorln("detect extension error:", err, "orig url:", origUrl)
+		} else  if len(exts) > 0 {
 			ext = exts[0]
 		}
 	}
 
+	if ext == "" || !strings.Contains("png,jpg,jpeg,gif,bmp", strings.ToLower(ext)) {
+		logger.Errorln("can't fetch extension, url:", origUrl)
+		return origUrl, errors.New("can't fetch extension")
+	}
+
 	prefix := times.Format("ymd")
 	if len(prefixs) > 0 {
 		prefix = prefixs[0]
diff --git a/model/feed.go b/model/feed.go
@@ -150,7 +150,7 @@ func PublishFeed(object interface{}, objectExt interface{}, me *Me) {
 		}
 	}
 
-	feedDay := config.ConfigFile.MustInt("global", "feed_day", 7)
+	feedDay := config.ConfigFile.MustInt("feed", "day", 7)
 	feed.Seq = feedDay * 24
 	if me != nil && me.IsAdmin {
 		feed.Seq += 100000

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func PublishFeed(object interface{}, objectExt interface{}, me *Me) {`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- feedDay := config.ConfigFile.MustInt("global", "feed_day", 7)`
	`153`	`+ feedDay := config.ConfigFile.MustInt("feed", "day", 7)`
`154`	`154`	`feed.Seq = feedDay * 24`
`155`	`155`	`if me != nil && me.IsAdmin {`
`156`	`156`	`feed.Seq += 100000`