From 556ca73a5da43c7de665d3de2483f63dd183e225 Mon Sep 17 00:00:00 2001
From: Minho <longfei6671@163.com>
Date: Thu, 22 Mar 2018 20:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gopkg.toml             |  4 ----
 controllers/book.go    |  2 ++
 controllers/manager.go | 18 ++++++++++--------
 models/book_result.go  | 20 +++++++++++++++++---
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/Gopkg.toml b/Gopkg.toml
index c3f303f6..96c549bf 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -57,10 +57,6 @@
   branch = "master"
   name = "github.com/nfnt/resize"
 
-[[constraint]]
-  name = "github.com/russross/blackfriday"
-  version = "2.0.0"
-
 [[constraint]]
   name = "gopkg.in/ldap.v2"
   version = "2.5.1"
diff --git a/controllers/book.go b/controllers/book.go
index cc7736e8..25329dea 100644
--- a/controllers/book.go
+++ b/controllers/book.go
@@ -44,6 +44,8 @@ func (c *BookController) Index() {
 
 	for i,book := range books {
 		books[i].Description = utils.StripTags(string(blackfriday.Run([]byte(book.Description))))
+		books[i].ModifyTime = book.ModifyTime.Local()
+		books[i].CreateTime = book.CreateTime.Local()
 	}
 
 	if totalCount > 0 {
diff --git a/controllers/manager.go b/controllers/manager.go
index da9a6f7c..01f861d3 100644
--- a/controllers/manager.go
+++ b/controllers/manager.go
@@ -298,6 +298,8 @@ func (c *ManagerController) Books() {
 	}
 	for i,book := range books {
 		books[i].Description = utils.StripTags(string(blackfriday.Run([]byte(book.Description))))
+		books[i].ModifyTime = book.ModifyTime.Local()
+		books[i].CreateTime = book.CreateTime.Local()
 	}
 	c.Data["Lists"] = books
 }
@@ -319,17 +321,17 @@ func (c *ManagerController) EditBook() {
 	}
 	if c.Ctx.Input.IsPost() {
 
-		book_name := strings.TrimSpace(c.GetString("book_name"))
+		bookName := strings.TrimSpace(c.GetString("book_name"))
 		description := strings.TrimSpace(c.GetString("description", ""))
-		comment_status := c.GetString("comment_status")
+		commentStatus := c.GetString("comment_status")
 		tag := strings.TrimSpace(c.GetString("label"))
-		order_index, _ := c.GetInt("order_index", 0)
+		orderIndex, _ := c.GetInt("order_index", 0)
 
 		if strings.Count(description, "") > 500 {
 			c.JsonResult(6004, "项目描述不能大于500字")
 		}
-		if comment_status != "open" && comment_status != "closed" && comment_status != "group_only" && comment_status != "registered_only" {
-			comment_status = "closed"
+		if commentStatus != "open" && commentStatus != "closed" && commentStatus != "group_only" && commentStatus != "registered_only" {
+			commentStatus = "closed"
 		}
 		if tag != "" {
 			tags := strings.Split(tag, ";")
@@ -338,11 +340,11 @@ func (c *ManagerController) EditBook() {
 			}
 		}
 
-		book.BookName = book_name
+		book.BookName = bookName
 		book.Description = description
-		book.CommentStatus = comment_status
+		book.CommentStatus = commentStatus
 		book.Label = tag
-		book.OrderIndex = order_index
+		book.OrderIndex = orderIndex
 
 		if err := book.Update(); err != nil {
 			c.JsonResult(6006, "保存失败")
diff --git a/models/book_result.go b/models/book_result.go
index 40d4cd31..96a87c07 100644
--- a/models/book_result.go
+++ b/models/book_result.go
@@ -125,7 +125,7 @@ func (m *BookResult) FindByIdentify(identify string, memberId int) (*BookResult,
 		member2 := NewMember()
 		member2.Find(doc.ModifyAt)
 
-		m.LastModifyText = member2.Account + " 于 " + doc.ModifyTime.Format("2006-01-02 15:04:05")
+		m.LastModifyText = member2.Account + " 于 " + doc.ModifyTime.Local().Format("2006-01-02 15:04:05")
 	}
 
 	return m, nil
@@ -168,8 +168,8 @@ func (m *BookResult) ToBookResult(book Book) *BookResult {
 	m.DocCount = book.DocCount
 	m.CommentStatus = book.CommentStatus
 	m.CommentCount = book.CommentCount
-	m.CreateTime = book.CreateTime
-	m.ModifyTime = book.ModifyTime
+	m.CreateTime = book.CreateTime.Local()
+	m.ModifyTime = book.ModifyTime.Local()
 	m.Cover = book.Cover
 	m.Label = book.Label
 	m.Status = book.Status
@@ -187,6 +187,20 @@ func (m *BookResult) ToBookResult(book Book) *BookResult {
 	if book.Editor == "" {
 		m.Editor = "markdown"
 	}
+
+	doc := NewDocument()
+
+	o := orm.NewOrm()
+
+	err := o.QueryTable(doc.TableNameWithPrefix()).Filter("book_id", book.BookId).OrderBy("modify_time").One(doc)
+
+	if err == nil {
+		member2 := NewMember()
+		member2.Find(doc.ModifyAt)
+
+		m.LastModifyText = member2.Account + " 于 " + doc.ModifyTime.Local().Format("2006-01-02 15:04:05")
+	}
+
 	return m
 }