增加博文置顶功能

xuxinhua · xuxinhua · commit 4eee4c84604e · 2015-04-21T14:08:01.000+08:00
diff --git a/websites/code/gox_dispatcher/src/.gitignore b/websites/code/gox_dispatcher/src/.gitignore
@@ -0,0 +1 @@
+/github.com
diff --git a/websites/code/studygolang/src/.gitignore b/websites/code/studygolang/src/.gitignore
@@ -0,0 +1 @@
+/github.com
diff --git a/websites/code/studygolang/src/model/article.go b/websites/code/studygolang/src/model/article.go
@@ -38,6 +38,7 @@ type Article struct {
 	Viewnum   int    `json:"viewnum"`
 	Cmtnum    int    `json:"cmtnum"`
 	Likenum   int    `json:"likenum"`
+	Top       uint8  `json:"top"`
 	Status    int    `json:"status"`
 	OpUser    string `json:"op_user"`
 	Ctime     string `json:"ctime"`
@@ -137,6 +138,7 @@ func (this *Article) colFieldMap() map[string]interface{} {
 		"viewnum":    &this.Viewnum,
 		"cmtnum":     &this.Cmtnum,
 		"likenum":    &this.Likenum,
+		"top":        &this.Top,
 		"status":     &this.Status,
 		"op_user":    &this.OpUser,
 		"ctime":      &this.Ctime,
diff --git a/websites/code/studygolang/src/service/article.go b/websites/code/studygolang/src/service/article.go
@@ -216,6 +216,15 @@ func FindArticles(lastId, limit string) []*model.Article {
 		return nil
 	}
 
+	topArticles, err := article.Where("top=?", 1).Order("id DESC").FindAll()
+	if err != nil {
+		logger.Errorln("article service Find Top Articles Error:", err)
+		return nil
+	}
+	if len(topArticles) > 0 {
+		articleList = append(topArticles, articleList...)
+	}
+
 	return articleList
 }
 
diff --git a/websites/code/studygolang/template/articles/list.html b/websites/code/studygolang/template/articles/list.html
@@ -23,7 +23,9 @@
 				{{else}}
 				<div>
 				{{end}}
-					<h2><a href="/articles/{{.Id}}" target="_blank" title="{{.Title}}">{{.Title}}</a></h2>
+					<h2><a href="/articles/{{.Id}}" target="_blank" title="{{.Title}}">
+						{{if .Top}}<font color="red">[置顶]</font>{{end}}{{.Title}}
+					</a></h2>
 					<p class="text">{{substring .Txt 250 "..."}}<a href="/articles/{{.Id}}" target="_blank" title="阅读全文">阅读全文</a></p>
 				</div>
 			</div>
diff --git a/websites/code/studygolang/template/index.html b/websites/code/studygolang/template/index.html
@@ -56,7 +56,9 @@ <h3><a href="/articles">最新博文</a></h3>
 					{{else}}
 					<div>
 					{{end}}
-						<h2><a href="/articles/{{.Id}}" target="_blank" title="{{.Title}}">{{.Title}}</a></h2>
+						<h2><a href="/articles/{{.Id}}" target="_blank" title="{{.Title}}">
+							{{if .Top}}<font color="red">[置顶]</font>{{end}}{{.Title}}
+						</a></h2>
 						<p class="text">{{substring .Txt 220 "..."}}<a href="/articles/{{.Id}}" target="_blank" title="阅读全文">阅读全文</a></p>
 					</div>
 				</div>
diff --git a/websites/databases/studygolang_db.sql b/websites/databases/studygolang_db.sql
@@ -345,12 +345,14 @@ CREATE TABLE `articles` (
   `viewnum` int unsigned NOT NULL DEFAULT 0 COMMENT '浏览数',
   `cmtnum` int unsigned NOT NULL DEFAULT 0 COMMENT '评论数',
   `likenum` int unsigned NOT NULL DEFAULT 0 COMMENT '赞数',
+  `top` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '置顶，0否，1置顶',
   `status` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '状态：0-初始抓取；1-已上线；2-下线(审核拒绝)',
   `op_user` varchar(20) NOT NULL DEFAULT '' COMMENT '操作人',
   `ctime` timestamp NOT NULL DEFAULT 0,
   `mtime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY (`url`),
+  KEY (`top`),
   KEY (`domain`),
   KEY (`ctime`)
 )ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT '网络文章聚合表';

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,15 @@ func FindArticles(lastId, limit string) []*model.Article {`
`216`	`216`	`return nil`
`217`	`217`	`}`
`218`	`218`
	`219`	`+ topArticles, err := article.Where("top=?", 1).Order("id DESC").FindAll()`
	`220`	`+ if err != nil {`
	`221`	`+ logger.Errorln("article service Find Top Articles Error:", err)`
	`222`	`+ return nil`
	`223`	`+ }`
	`224`	`+ if len(topArticles) > 0 {`
	`225`	`+ articleList = append(topArticles, articleList...)`
	`226`	`+ }`
	`227`	`+`
`219`	`228`	`return articleList`
`220`	`229`	`}`
`221`	`230`