From 813ef8a17bcc8f8f9082306926ce012b184e9149 Mon Sep 17 00:00:00 2001
From: Minho <longfei6671@163.com>
Date: Thu, 22 Mar 2018 16:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=B6=E5=8C=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commands/command.go     | 16 ++++++++--------
 controllers/document.go |  6 +++---
 models/document.go      |  3 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/commands/command.go b/commands/command.go
index 79517e6f..1723e110 100644
--- a/commands/command.go
+++ b/commands/command.go
@@ -30,13 +30,20 @@ import (
 func RegisterDataBase() {
 	beego.Info("正在初始化数据库配置.")
 	adapter := beego.AppConfig.String("db_adapter")
+	timezone := beego.AppConfig.String("timezone")
+	location, err := time.LoadLocation(timezone)
+	if err == nil {
+		orm.DefaultTimeLoc = location
+	} else {
+		beego.Error("加载时区配置信息失败,请检查是否存在ZONEINFO环境变量:",err)
+	}
 
 	if adapter == "mysql" {
 		host := beego.AppConfig.String("db_host")
 		database := beego.AppConfig.String("db_database")
 		username := beego.AppConfig.String("db_username")
 		password := beego.AppConfig.String("db_password")
-		timezone := beego.AppConfig.String("timezone")
+
 
 		port := beego.AppConfig.String("db_port")
 
@@ -47,13 +54,6 @@ func RegisterDataBase() {
 			beego.Error("注册默认数据库失败:",err)
 			os.Exit(1)
 		}
-
-		location, err := time.LoadLocation(timezone)
-		if err == nil {
-			orm.DefaultTimeLoc = location
-		} else {
-			beego.Error("加载时区配置信息失败,请检查是否存在ZONEINFO环境变量:",err)
-		}
 	} else if adapter == "sqlite3" {
 		database := beego.AppConfig.String("db_database")
 		if strings.HasPrefix(database, "./") {
diff --git a/controllers/document.go b/controllers/document.go
index 02c3e15b..116d4582 100644
--- a/controllers/document.go
+++ b/controllers/document.go
@@ -221,13 +221,13 @@ func (c *DocumentController) Read() {
 	}
 
 	docInfo += " 创建于 "
-	docInfo += doc.CreateTime.Format("2006-01-02 15:04")
+	docInfo += doc.CreateTime.Local().Format("2006-01-02 15:04")
 
 	if doc.ModifyTime != doc.CreateTime {
 		docInfo += "；更新于 "
-		docInfo += doc.ModifyTime.Format("2006-01-02 15:04")
+		docInfo += doc.ModifyTime.Local().Format("2006-01-02 15:04")
 		if strings.TrimSpace(doc.Release) != "" {
-			doc.Release += "<div class=\"wiki-bottom\">文档更新时间: " + doc.ModifyTime.Format("2006-01-02 15:04") + "</div>";
+			doc.Release += "<div class=\"wiki-bottom\">文档更新时间: " + doc.ModifyTime.Local().Format("2006-01-02 15:04") + "</div>";
 		}
 	}
 
diff --git a/models/document.go b/models/document.go
index 420eac58..50d186f3 100644
--- a/models/document.go
+++ b/models/document.go
@@ -33,7 +33,7 @@ type Document struct {
 	Content    string        `orm:"column(content);type(text);null" json:"content"`
 	CreateTime time.Time     `orm:"column(create_time);type(datetime);auto_now_add" json:"create_time"`
 	MemberId   int           `orm:"column(member_id);type(int)" json:"member_id"`
-	ModifyTime time.Time     `orm:"column(modify_time);type(datetime);auto_now" json:"modify_time"`
+	ModifyTime time.Time     `orm:"column(modify_time);type(datetime)" json:"modify_time"`
 	ModifyAt   int           `orm:"column(modify_at);type(int)" json:"-"`
 	Version    int64         `orm:"type(bigint);column(version)" json:"version"`
 	AttachList []*Attachment `orm:"-" json:"attach"`
@@ -81,6 +81,7 @@ func (m *Document) InsertOrUpdate(cols ...string) error {
 	o := orm.NewOrm()
 	var err error
 	if m.DocumentId > 0 {
+		m.ModifyTime = time.Now().Local()
 		_, err = o.Update(m)
 	} else {
 		_, err = o.Insert(m)