fix:1、修复匿名访问判断错误的BUG

2、重构配置文件自动加载逻辑

commands/command.go

@@ -25,6 +25,7 @@ import (
 	"github.com/lifei6671/mindoc/models"
 	"github.com/lifei6671/mindoc/utils/filetil"
 	"github.com/astaxie/beego/cache/redis"
+	"github.com/howeyc/fsnotify"
 )
 
 // RegisterDataBase 注册数据库
@@ -55,6 +56,7 @@ func RegisterDataBase() {
 			beego.Error("注册默认数据库失败->", err)
 			os.Exit(1)
 		}
+
 	} else if strings.EqualFold(adapter, "sqlite3") {
 
 		database := beego.AppConfig.String("db_database")
@@ -401,37 +403,37 @@ func RegisterCache() {
 //自动加载配置文件.修改了监听端口号和数据库配置无法自动生效.
 func RegisterAutoLoadConfig()  {
 	if conf.AutoLoadDelay > 0 {
-		ticker := time.NewTicker(time.Second * time.Duration(conf.AutoLoadDelay))
 
+		watcher, err := fsnotify.NewWatcher()
+
+		if err != nil {
+			beego.Error("创建配置文件监控器失败 ->",err)
+		}
 		go func() {
-			f,err := os.Stat(conf.ConfigurationFile)
-			if err != nil {
-				beego.Error("读取配置文件时出错 ->",err)
-				return
-			}
-			modTime := f.ModTime()
 			for {
 				select {
-				case <-ticker.C:
+				case ev := <-watcher.Event:
-					f,err := os.Stat(conf.ConfigurationFile)
+					//如果是修改了配置文件
-					if err != nil {
+					if ev.IsModify() {
-						beego.Error("读取配置文件时出错 ->",err)
-						break
-					}
-					if modTime != f.ModTime() {
 						if err := beego.LoadAppConfig("ini", conf.ConfigurationFile); err != nil {
 							beego.Error("An error occurred ->", err)
 							break
 						}
-						modTime = f.ModTime()
 						RegisterCache()
-
 						RegisterLogger("")
-						beego.Info("配置文件已加载")
+						beego.Info("配置文件已加载 ->", conf.ConfigurationFile)
 					}
+				case err := <-watcher.Error:
+					beego.Error("配置文件监控器错误 ->", err)
 				}
 			}
 		}()
+
+		err = watcher.Watch(conf.ConfigurationFile)
+
+		if err != nil {
+			beego.Error("监控配置文件失败 ->",err)
+		}
 	}
 }
 

controllers/BaseController.go

@@ -67,10 +67,9 @@ func (c *BaseController) Prepare() {
 		for _, item := range options {
 			c.Data[item.OptionName] = item.OptionValue
 			c.Option[item.OptionName] = item.OptionValue
-
-			c.EnableAnonymous = strings.EqualFold(item.OptionName, "ENABLE_ANONYMOUS") && item.OptionValue == "true"
-			c.EnableDocumentHistory = strings.EqualFold(item.OptionName, "ENABLE_DOCUMENT_HISTORY") && item.OptionValue == "true"
 		}
+		c.EnableAnonymous = strings.EqualFold(c.Option["ENABLE_ANONYMOUS"], "true")
+		c.EnableDocumentHistory = strings.EqualFold(c.Option["ENABLE_DOCUMENT_HISTORY"],"true")
 	}
 	c.Data["HighlightStyle"] = beego.AppConfig.DefaultString("highlight_style","github")
 

controllers/BlogController.go

@@ -16,41 +16,48 @@ import (
 	"html/template"
 	"encoding/json"
 	"github.com/lifei6671/mindoc/utils"
+	"net/url"
 )
 
-type BlogController struct{
+type BlogController struct {
 	BaseController
 }
 
+func (c *BlogController) Prepare() {
+	c.BaseController.Prepare()
+	if !c.EnableAnonymous && c.Member == nil {
+		c.Redirect(conf.URLFor("AccountController.Login")+"?url="+url.PathEscape(conf.BaseUrl+c.Ctx.Request.URL.RequestURI()), 302)
+	}
+}
+
 //文章阅读
 func (c *BlogController) Index() {
 	c.Prepare()
 	c.TplName = "blog/index.tpl"
-	blogId,_ := strconv.Atoi(c.Ctx.Input.Param(":id"))
+	blogId, _ := strconv.Atoi(c.Ctx.Input.Param(":id"))
 
-	if blogId <= 0{
+	if blogId <= 0 {
-		c.ShowErrorPage(404,"页面不存在")
+		c.ShowErrorPage(404, "页面不存在")
 	}
-	blogReadSession := fmt.Sprintf("blog:read:%d",blogId)
+	blogReadSession := fmt.Sprintf("blog:read:%d", blogId)
 
-	blog,err := models.NewBlog().FindFromCache(blogId)
+	blog, err := models.NewBlog().FindFromCache(blogId)
 
 	if err != nil {
-		c.ShowErrorPage(404,"文章不存在")
+		c.ShowErrorPage(404, "文章不存在")
 	}
 
 	if c.Ctx.Input.IsPost() {
 		password := c.GetString("password");
-
 		if blog.BlogStatus == "password" && password != blog.Password {
-			c.JsonResult(6001,"文章密码不正确")
+			c.JsonResult(6001, "文章密码不正确")
-		}else if blog.BlogStatus == "password" && password == blog.Password {
+		} else if blog.BlogStatus == "password" && password == blog.Password {
 			//如果密码输入正确，则存入session中
-			c.CruSession.Set(blogReadSession,blogId)
+			c.CruSession.Set(blogReadSession, blogId)
-			c.JsonResult(0,"OK")
+			c.JsonResult(0, "OK")
 		}
-		c.JsonResult(0,"OK")
+		c.JsonResult(0, "OK")
-	}else if blog.BlogStatus == "password" && (c.CruSession.Get(blogReadSession) == nil || (c.Member != nil && blog.MemberId != c.Member.MemberId && !c.Member.IsAdministrator() ) ){
+	} else if blog.BlogStatus == "password" && (c.CruSession.Get(blogReadSession) == nil || (c.Member != nil && blog.MemberId != c.Member.MemberId && !c.Member.IsAdministrator())) {
 		//如果不存在已输入密码的标记
 		c.TplName = "blog/index_password.tpl"
 	}
@@ -60,16 +67,15 @@ func (c *BlogController) Index() {
 	c.Data["Content"] = template.HTML(blog.BlogRelease)
 
 	if blog.BlogExcerpt == "" {
-		c.Data["Description"] = utils.AutoSummary(blog.BlogRelease,120)
+		c.Data["Description"] = utils.AutoSummary(blog.BlogRelease, 120)
-	}else{
+	} else {
 		c.Data["Description"] = blog.BlogExcerpt
 	}
 
-
+	if nextBlog, err := models.NewBlog().QueryNext(blogId); err == nil {
-	if nextBlog,err := models.NewBlog().QueryNext(blogId);err == nil {
 		c.Data["Next"] = nextBlog
 	}
-	if preBlog,err := models.NewBlog().QueryPrevious(blogId);err == nil {
+	if preBlog, err := models.NewBlog().QueryPrevious(blogId); err == nil {
 		c.Data["Previous"] = preBlog
 	}
 }
@@ -82,21 +88,20 @@ func (c *BlogController) List() {
 
 	var blogList []*models.Blog
 	var totalCount int
-	var  err error
+	var err error
-
-	blogList,totalCount,err = models.NewBlog().FindToPager(pageIndex,conf.PageSize,0,"")
 
+	blogList, totalCount, err = models.NewBlog().FindToPager(pageIndex, conf.PageSize, 0, "")
 
 	if err != nil && err != orm.ErrNoRows {
-		c.ShowErrorPage(500,err.Error())
+		c.ShowErrorPage(500, err.Error())
 	}
 	if totalCount > 0 {
 		pager := pagination.NewPagination(c.Ctx.Request, totalCount, conf.PageSize, c.BaseUrl())
 		c.Data["PageHtml"] = pager.HtmlPages()
-		for _,blog := range blogList {
+		for _, blog := range blogList {
 			//如果没有添加文章摘要，则自动提取
 			if blog.BlogExcerpt == "" {
-				blog.BlogExcerpt = utils.AutoSummary(blog.BlogRelease,120)
+				blog.BlogExcerpt = utils.AutoSummary(blog.BlogRelease, 120)
 			}
 			blog.Link()
 		}
@@ -114,10 +119,10 @@ func (c *BlogController) ManageList() {
 
 	pageIndex, _ := c.GetInt("page", 1)
 
-	blogList,totalCount,err := models.NewBlog().FindToPager(pageIndex,conf.PageSize,c.Member.MemberId,"")
+	blogList, totalCount, err := models.NewBlog().FindToPager(pageIndex, conf.PageSize, c.Member.MemberId, "")
 
 	if err != nil {
-		c.ShowErrorPage(500,err.Error())
+		c.ShowErrorPage(500, err.Error())
 	}
 	if totalCount > 0 {
 		pager := pagination.NewPagination(c.Ctx.Request, totalCount, conf.PageSize, c.BaseUrl())
@@ -136,46 +141,46 @@ func (c *BlogController) ManageSetting() {
 	c.TplName = "blog/manage_setting.tpl"
 	//如果是post请求
 	if c.Ctx.Input.IsPost() {
-		blogId,_ := c.GetInt("id",0)
+		blogId, _ := c.GetInt("id", 0)
 		blogTitle := c.GetString("title")
 		blogIdentify := c.GetString("identify")
-		orderIndex,_ := c.GetInt("order_index",0)
+		orderIndex, _ := c.GetInt("order_index", 0)
-		blogType,_ := c.GetInt("blog_type",0)
+		blogType, _ := c.GetInt("blog_type", 0)
-		blogExcerpt := c.GetString("excerpt","")
+		blogExcerpt := c.GetString("excerpt", "")
-		blogStatus := c.GetString("status","publish")
+		blogStatus := c.GetString("status", "publish")
-		blogPassword := c.GetString("password","")
+		blogPassword := c.GetString("password", "")
 		documentIdentify := strings.TrimSpace(c.GetString("documentIdentify"))
 		bookIdentify := strings.TrimSpace(c.GetString("bookIdentify"))
 		documentId := 0
 
 		if blogTitle == "" {
-			c.JsonResult(6001,"文章标题不能为空")
+			c.JsonResult(6001, "文章标题不能为空")
 		}
-		if strings.Count(blogExcerpt,"") > 500 {
+		if strings.Count(blogExcerpt, "") > 500 {
-			c.JsonResult(6008,"文章摘要必须小于500字符")
+			c.JsonResult(6008, "文章摘要必须小于500字符")
 		}
 		if blogStatus != "public" && blogStatus != "password" && blogStatus != "draft" {
 			blogStatus = "public"
 		}
 		if blogStatus == "password" && blogPassword == "" {
-			c.JsonResult(6010,"加密文章请设置密码")
+			c.JsonResult(6010, "加密文章请设置密码")
 		}
 		if blogType != 0 && blogType != 1 {
-			c.JsonResult(6005,"未知的文章类型")
+			c.JsonResult(6005, "未知的文章类型")
 		}
-		if strings.Count(blogTitle,"") > 200 {
+		if strings.Count(blogTitle, "") > 200 {
-			c.JsonResult(6002,"文章标题不能大于200个字符")
+			c.JsonResult(6002, "文章标题不能大于200个字符")
 		}
 		//如果是关联文章，需要同步关联的文档
 		if blogType == 1 {
-			book,err := models.NewBook().FindByIdentify(bookIdentify)
+			book, err := models.NewBook().FindByIdentify(bookIdentify)
 
 			if err != nil {
-				c.JsonResult(6011,"关联文档的项目不存在")
+				c.JsonResult(6011, "关联文档的项目不存在")
 			}
-			doc,err := models.NewDocument().FindByIdentityFirst(documentIdentify,book.BookId)
+			doc, err := models.NewDocument().FindByIdentityFirst(documentIdentify, book.BookId)
-			if  err != nil {
+			if err != nil {
-				c.JsonResult(6003,"查询关联项目文档时出错")
+				c.JsonResult(6003, "查询关联项目文档时出错")
 			}
 			documentId = doc.DocumentId
 
@@ -205,17 +210,17 @@ func (c *BlogController) ManageSetting() {
 			//如果设置了文章标识
 			if blogIdentify != "" {
 				//如果查询到的文章标识存在并且不是当前文章的id
-				if b,err := models.NewBlog().FindByIdentify(blogIdentify); err == nil && b.BlogId != blogId {
+				if b, err := models.NewBlog().FindByIdentify(blogIdentify); err == nil && b.BlogId != blogId {
-					c.JsonResult(6004,"文章标识已存在")
+					c.JsonResult(6004, "文章标识已存在")
 				}
 			}
 			blog.Modified = time.Now()
 			blog.ModifyAt = c.Member.MemberId
-		}else{
+		} else {
 			//如果设置了文章标识
 			if blogIdentify != "" {
 				if models.NewBlog().IsExist(blogIdentify) {
-					c.JsonResult(6004,"文章标识已存在")
+					c.JsonResult(6004, "文章标识已存在")
 				}
 			}
 
@@ -224,8 +229,8 @@ func (c *BlogController) ManageSetting() {
 			blog.Created = time.Now()
 		}
 		if blogIdentify == "" {
-			blog.BlogIdentify = fmt.Sprintf("%s-%d","post",time.Now().UnixNano())
+			blog.BlogIdentify = fmt.Sprintf("%s-%d", "post", time.Now().UnixNano())
-		}else{
+		} else {
 			blog.BlogIdentify = blogIdentify
 		}
 
@@ -240,30 +245,29 @@ func (c *BlogController) ManageSetting() {
 		blog.BlogStatus = blogStatus
 		blog.Password = blogPassword
 
-		if err := blog.Save();err != nil {
+		if err := blog.Save(); err != nil {
-			beego.Error("保存文章失败 -> ",err)
+			beego.Error("保存文章失败 -> ", err)
-			c.JsonResult(6011,"保存文章失败")
+			c.JsonResult(6011, "保存文章失败")
-		}else{
+		} else {
-			c.JsonResult(0,"ok",blog)
+			c.JsonResult(0, "ok", blog)
 		}
 	}
 	if c.Ctx.Input.Referer() == "" {
 		c.Data["Referer"] = "javascript:history.back();"
-	}else{
+	} else {
 		c.Data["Referer"] = c.Ctx.Input.Referer()
 	}
-	blogId,err := strconv.Atoi(c.Ctx.Input.Param(":id"))
+	blogId, err := strconv.Atoi(c.Ctx.Input.Param(":id"))
 
 	c.Data["DocumentIdentify"] = "";
-
 	if err == nil {
-		blog,err := models.NewBlog().FindByIdAndMemberId(blogId,c.Member.MemberId)
+		blog, err := models.NewBlog().FindByIdAndMemberId(blogId, c.Member.MemberId)
 		if err != nil {
-			c.ShowErrorPage(500,err.Error())
+			c.ShowErrorPage(500, err.Error())
 		}
 
 		c.Data["Model"] = blog
-	}else{
+	} else {
 		c.Data["Model"] = models.NewBlog()
 	}
 }
@@ -274,37 +278,37 @@ func (c *BlogController) ManageEdit() {
 	c.TplName = "blog/manage_edit.tpl"
 
 	if c.Ctx.Input.IsPost() {
-		blogId,_ := c.GetInt("blogId",0)
+		blogId, _ := c.GetInt("blogId", 0)
 
 		if blogId <= 0 {
-			c.JsonResult(6001,"文章参数错误")
+			c.JsonResult(6001, "文章参数错误")
 		}
-		blogContent := c.GetString("content","")
+		blogContent := c.GetString("content", "")
-		blogHtml := c.GetString("htmlContent","")
+		blogHtml := c.GetString("htmlContent", "")
-		version,_ := c.GetInt64("version",0)
+		version, _ := c.GetInt64("version", 0)
 		cover := c.GetString("cover")
 
 		var blog *models.Blog
 		var err error
 
 		if c.Member.IsAdministrator() {
-			blog,err = models.NewBlog().Find(blogId)
+			blog, err = models.NewBlog().Find(blogId)
-		}else{
+		} else {
-			blog,err = models.NewBlog().FindByIdAndMemberId(blogId,c.Member.MemberId)
+			blog, err = models.NewBlog().FindByIdAndMemberId(blogId, c.Member.MemberId)
 		}
 		if err != nil {
-			beego.Error("查询文章失败 ->",err)
+			beego.Error("查询文章失败 ->", err)
-			c.JsonResult(6002,"查询文章失败")
+			c.JsonResult(6002, "查询文章失败")
 		}
-		if version > 0 && blog.Version != version && cover != "yes"{
+		if version > 0 && blog.Version != version && cover != "yes" {
-			c.JsonResult(6005,"文章已被修改")
+			c.JsonResult(6005, "文章已被修改")
 		}
 		//如果是关联文章，需要同步关联的文档
 		if blog.BlogType == 1 {
-			doc,err := models.NewDocument().Find(blog.DocumentId)
+			doc, err := models.NewDocument().Find(blog.DocumentId)
 			if err != nil {
 				beego.Error("查询关联项目文档时出错 ->", err)
-				c.JsonResult(6003,"查询关联项目文档时出错")
+				c.JsonResult(6003, "查询关联项目文档时出错")
 			}
 			book, err := models.NewBook().Find(doc.BookId)
 			if err != nil {
@@ -326,9 +330,9 @@ func (c *BlogController) ManageEdit() {
 			doc.Content = blogHtml
 			doc.ModifyTime = time.Now()
 			doc.ModifyAt = c.Member.MemberId
-			if err := doc.InsertOrUpdate("markdown","release","content","modify_time","modify_at");err != nil {
+			if err := doc.InsertOrUpdate("markdown", "release", "content", "modify_time", "modify_at"); err != nil {
-				beego.Error("保存关联文档时出错 ->",err)
+				beego.Error("保存关联文档时出错 ->", err)
-				c.JsonResult(6004,"保存关联文档时出错")
+				c.JsonResult(6004, "保存关联文档时出错")
 			}
 		}
 
@@ -337,94 +341,94 @@ func (c *BlogController) ManageEdit() {
 		blog.ModifyAt = c.Member.MemberId
 		blog.Modified = time.Now()
 
-		if err := blog.Save("blog_content","blog_release","modify_at","modify_time","version");err != nil {
+		if err := blog.Save("blog_content", "blog_release", "modify_at", "modify_time", "version"); err != nil {
-			beego.Error("保存文章失败 -> ",err)
+			beego.Error("保存文章失败 -> ", err)
-			c.JsonResult(6011,"保存文章失败")
+			c.JsonResult(6011, "保存文章失败")
-		}else{
+		} else {
-			c.JsonResult(0,"ok",blog)
+			c.JsonResult(0, "ok", blog)
 		}
 	}
 
-	blogId,_ := strconv.Atoi(c.Ctx.Input.Param(":id"))
+	blogId, _ := strconv.Atoi(c.Ctx.Input.Param(":id"))
 
 	if blogId <= 0 {
-		c.ShowErrorPage(500,"参数错误")
+		c.ShowErrorPage(500, "参数错误")
 	}
 	var blog *models.Blog
 	var err error
 
 	if c.Member.IsAdministrator() {
-		blog,err = models.NewBlog().Find(blogId)
+		blog, err = models.NewBlog().Find(blogId)
-	}else{
+	} else {
-		blog,err = models.NewBlog().FindByIdAndMemberId(blogId,c.Member.MemberId)
+		blog, err = models.NewBlog().FindByIdAndMemberId(blogId, c.Member.MemberId)
 	}
 	if err != nil {
-		c.ShowErrorPage(404,"文章不存在或已删除")
+		c.ShowErrorPage(404, "文章不存在或已删除")
 	}
 	blog.LinkAttach()
 
 	if len(blog.AttachList) > 0 {
 		returnJSON, err := json.Marshal(blog.AttachList)
 		if err != nil {
-			beego.Error("序列化文章附件时出错 ->",err)
+			beego.Error("序列化文章附件时出错 ->", err)
-		}else{
+		} else {
 			c.Data["AttachList"] = template.JS(string(returnJSON))
 		}
-	}else{
+	} else {
 		c.Data["AttachList"] = template.JS("[]")
 	}
 	if conf.GetUploadFileSize() > 0 {
 		c.Data["UploadFileSize"] = conf.GetUploadFileSize()
-	}else{
+	} else {
 		c.Data["UploadFileSize"] = "undefined";
 	}
 	c.Data["Model"] = blog
 }
 
 //删除文章
-func (c *BlogController) ManageDelete()  {
+func (c *BlogController) ManageDelete() {
 	c.Prepare()
-	blogId,_ := c.GetInt("blog_id",0)
+	blogId, _ := c.GetInt("blog_id", 0)
 
 	if blogId <= 0 {
-		c.JsonResult(6001,"参数错误")
+		c.JsonResult(6001, "参数错误")
 	}
 	var blog *models.Blog
 	var err error
 
 	if c.Member.IsAdministrator() {
-		blog,err = models.NewBlog().Find(blogId)
+		blog, err = models.NewBlog().Find(blogId)
-	}else{
+	} else {
-		blog,err = models.NewBlog().FindByIdAndMemberId(blogId,c.Member.MemberId)
+		blog, err = models.NewBlog().FindByIdAndMemberId(blogId, c.Member.MemberId)
 	}
 	if err != nil {
-		c.JsonResult(6002,"文章不存在或已删除")
+		c.JsonResult(6002, "文章不存在或已删除")
 	}
 
 	if err := blog.Delete(blogId); err != nil {
-		c.JsonResult(6003,"删除失败")
+		c.JsonResult(6003, "删除失败")
-	}else{
+	} else {
-		c.JsonResult(0,"删除成功")
+		c.JsonResult(0, "删除成功")
 	}
 
 }
 
 // 上传附件或图片
 func (c *BlogController) Upload() {
-
+	c.Prepare()
 	blogId, _ := c.GetInt("blogId")
 
 	if blogId <= 0 {
 		c.JsonResult(6001, "参数错误")
 	}
 
-	blog,err := models.NewBlog().Find(blogId)
+	blog, err := models.NewBlog().Find(blogId)
 
 	if err != nil {
-		c.JsonResult(6010,"文章不存在")
+		c.JsonResult(6010, "文章不存在")
 	}
 	if !c.Member.IsAdministrator() && blog.MemberId != c.Member.MemberId {
-		c.JsonResult(6011,"没有文章的访问权限")
+		c.JsonResult(6011, "没有文章的访问权限")
 	}
 
 	name := "editormd-file-file"
@@ -549,7 +553,6 @@ func (c *BlogController) Upload() {
 	result["url"] = httpPath
 	result["alt"] = fileName
 
-
 	c.Ctx.Output.JSON(result, true, false)
 	c.StopRun()
 }
@@ -579,7 +582,7 @@ func (c *BlogController) RemoveAttachment() {
 	}
 
 	if !c.Member.IsAdministrator() {
-		_, err := models.NewBlog().FindByIdAndMemberId(attach.DocumentId,c.Member.MemberId)
+		_, err := models.NewBlog().FindByIdAndMemberId(attach.DocumentId, c.Member.MemberId)
 
 		if err != nil {
 			beego.Error(err)
@@ -588,12 +591,12 @@ func (c *BlogController) RemoveAttachment() {
 	}
 
 	if blog.BlogType == 1 && attach.BookId != blog.BookId && attach.DocumentId != blog.DocumentId {
-		c.ShowErrorPage(404,"附件不存在")
+		c.ShowErrorPage(404, "附件不存在")
-	}else if attach.BookId !=0 || attach.DocumentId != blogId {
+	} else if attach.BookId != 0 || attach.DocumentId != blogId {
-		c.ShowErrorPage(404,"附件不存在")
+		c.ShowErrorPage(404, "附件不存在")
 	}
 
-	if err := attach.Delete();err != nil {
+	if err := attach.Delete(); err != nil {
 		beego.Error(err)
 		c.JsonResult(6005, "删除失败")
 	}
@@ -619,9 +622,9 @@ func (c *BlogController) Download() {
 			c.ShowErrorPage(500, "查询文章时异常")
 		}
 	}
-	blogReadSession := fmt.Sprintf("blog:read:%d",blogId)
+	blogReadSession := fmt.Sprintf("blog:read:%d", blogId)
 	//如果没有启动匿名访问，或者设置了访问密码
-	if (c.Member == nil && !c.EnableAnonymous) || ( blog.BlogStatus == "password" && password != blog.Password && c.CruSession.Get(blogReadSession) == nil) {
+	if (c.Member == nil && !c.EnableAnonymous) || (blog.BlogStatus == "password" && password != blog.Password && c.CruSession.Get(blogReadSession) == nil) {
 		c.ShowErrorPage(403, "没有下载权限")
 	}
 
@@ -631,15 +634,15 @@ func (c *BlogController) Download() {
 	if err != nil {
 		beego.Error("DownloadAttachment => ", err)
 		if err == orm.ErrNoRows {
-			c.ShowErrorPage(404,"附件不存在")
+			c.ShowErrorPage(404, "附件不存在")
 		} else {
-			c.ShowErrorPage(500,"查询附件时出现异常")
+			c.ShowErrorPage(500, "查询附件时出现异常")
 		}
 	}
 	if blog.BlogType == 1 && attachment.BookId != blog.BookId && attachment.DocumentId != blog.DocumentId {
-		c.ShowErrorPage(404,"附件不存在")
+		c.ShowErrorPage(404, "附件不存在")
-	}else if attachment.BookId !=0 || attachment.DocumentId != blogId {
+	} else if attachment.BookId != 0 || attachment.DocumentId != blogId {
-		c.ShowErrorPage(404,"附件不存在")
+		c.ShowErrorPage(404, "附件不存在")
 	}
 
 	c.Ctx.Output.Download(filepath.Join(conf.WorkingDirectory, attachment.FilePath), attachment.FileName)

controllers/HomeController.go

@@ -2,25 +2,29 @@ package controllers
 
 import (
 	"math"
-	"net/url"
-
 	"github.com/astaxie/beego"
-	"github.com/lifei6671/mindoc/conf"
 	"github.com/lifei6671/mindoc/models"
 	"github.com/lifei6671/mindoc/utils/pagination"
+	"github.com/lifei6671/mindoc/conf"
+	"net/url"
 )
 
 type HomeController struct {
 	BaseController
 }
 
-func (c *HomeController) Index() {
+func (c *HomeController) Prepare() {
-	c.Prepare()
+	c.BaseController.Prepare()
-	c.TplName = "home/index.tpl"
 	//如果没有开启匿名访问，则跳转到登录页面
 	if !c.EnableAnonymous && c.Member == nil {
 		c.Redirect(conf.URLFor("AccountController.Login")+"?url="+url.PathEscape(conf.BaseUrl+c.Ctx.Request.URL.RequestURI()), 302)
 	}
+}
+
+func (c *HomeController) Index() {
+	c.Prepare()
+	c.TplName = "home/index.tpl"
+
 	pageIndex, _ := c.GetInt("page", 1)
 	pageSize := 18
 

controllers/ManagerController.go

@@ -19,6 +19,8 @@ import (
 	"github.com/lifei6671/mindoc/utils/filetil"
 	"github.com/lifei6671/mindoc/utils/pagination"
 	"gopkg.in/russross/blackfriday.v2"
+	"io/ioutil"
+	"os"
 )
 
 type ManagerController struct {
@@ -723,3 +725,40 @@ func (c *ManagerController) LabelDelete() {
 		c.JsonResult(0, "ok")
 	}
 }
+
+func (c *ManagerController) Config() {
+	c.Prepare()
+	c.TplName = "manager/config.tpl"
+	if c.Ctx.Input.IsPost() {
+		content := strings.TrimSpace(c.GetString("configFileTextArea"))
+		if content == "" {
+			c.JsonResult(500,"配置文件不能为空")
+		}
+		tf,err := ioutil.TempFile(os.TempDir(),"mindoc")
+
+		if err != nil {
+			beego.Error("创建临时文件失败 ->",err)
+			c.JsonResult(5001,"创建临时文件失败")
+		}
+		defer tf.Close()
+
+		tf.WriteString(content)
+
+		err = beego.LoadAppConfig("ini",tf.Name())
+
+		if err != nil {
+			beego.Error("加载配置文件失败 ->",err)
+			c.JsonResult(5002,"加载配置文件失败")
+		}
+		err = filetil.CopyFile(tf.Name(), conf.ConfigurationFile)
+		if err != nil {
+			beego.Error("保存配置文件失败 ->",err)
+			c.JsonResult(5003,"保存配置文件失败")
+		}
+		c.JsonResult(0,"保存成功")
+	}
+	c.Data["ConfigContent"] = ""
+	if b,err := ioutil.ReadFile(conf.ConfigurationFile); err == nil {
+		c.Data["ConfigContent"] = string(b)
+	}
+}

routers/router.go

@@ -38,6 +38,8 @@ func init() {
 	beego.Router("/manager/label/list", &controllers.ManagerController{},"get:LabelList")
 	beego.Router("/manager/label/delete/:id", &controllers.ManagerController{},"post:LabelDelete")
 
+	beego.Router("/manager/config",  &controllers.ManagerController{}, "*:Config")
+
 	beego.Router("/setting", &controllers.SettingController{}, "*:Index")
 	beego.Router("/setting/password", &controllers.SettingController{}, "*:Password")
 	beego.Router("/setting/upload", &controllers.SettingController{}, "*:Upload")

views/manager/attach_detailed.tpl

@@ -24,16 +24,7 @@
     {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+        {{template "manager/widgets.tpl" "attach"}}
-                <ul class="menu">
-                    <li><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li class="active"><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-                </ul>
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/attach_list.tpl

@@ -24,17 +24,7 @@
     {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+        {{template "manager/widgets.tpl" "attach"}}
-                <ul class="menu">
-                    <li><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                    {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
-                    <li><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li class="active"><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-                </ul>
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/books.tpl

@@ -24,17 +24,7 @@
     {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+{{template "manager/widgets.tpl" "books"}}
-                <ul class="menu">
-                    <li><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li class="active"><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                    {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
-                    <li><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-                </ul>
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/config.tpl

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>配置文件 - Powered by MinDoc</title>
+
+    <!-- Bootstrap -->
+    <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
+    <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
+    <link href="{{cdncss "/static/editor.md/css/editormd.css"}}" rel="stylesheet">
+    <link href="{{cdncss "/static/css/main.css" "version"}}" rel="stylesheet">
+</head>
+<body>
+<div class="manual-reader">
+{{template "widgets/header.tpl" .}}
+    <div class="container manual-body">
+        <div class="row">
+        {{template "manager/widgets.tpl" "config"}}
+            <div class="page-right">
+                <div class="m-box">
+                    <div class="box-head">
+                        <strong class="box-title"> 配置管理</strong>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <form method="post" id="configFileContainerForm" action="{{urlfor "ManagerController.Config"}}">
+                        <div id="configFileContainer">
+                            <textarea style="display:none;" name="configFileTextArea">{{.ConfigContent}}</textarea>
+                        </div>
+
+                        <div class="form-group">
+                            <button type="submit" id="btnSaveConfigFile" class="btn btn-success" data-loading-text="保存中...">保存修改</button>
+                            <span id="form-error-message" class="error-message"></span>
+                        </div>
+                    </form>
+
+                    <div class="clearfix"></div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+{{template "widgets/footer.tpl" .}}
+</div>
+
+
+<script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/editor.md/editormd.js" "version"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/js/main.js"}}" type="text/javascript"></script>
+<script type="text/javascript">
+    $(function() {
+        var configEditor = editormd("configFileContainer", {
+            width            : "100%",
+            height           : 720,
+            watch            : false,
+            toolbar          : false,
+            codeFold         : true,
+            searchReplace    : true,
+            placeholder      : "",
+            mode             : "text/x-properties",
+            path             : "{{cdnjs "/static/editor.md/lib/"}}"
+        });
+
+        $("#configFileContainerForm").ajaxForm({
+            beforeSubmit : function () {
+                $("#btnSaveBookInfo").button("loading");
+            },success : function (res) {
+                if(res.errcode === 0) {
+                    showSuccess("保存成功", "#form-error-message")
+                }else{
+                    showError(res.message);
+                }
+                $("#btnSaveConfigFile").button("reset");
+            }
+        });
+    });
+</script>
+</body>
+</html>

views/manager/edit_book.tpl

@@ -15,29 +15,13 @@
     <link href="{{cdncss "/static/webuploader/webuploader.css"}}" rel="stylesheet">
     <link href="{{cdncss "/static/cropper/2.3.4/cropper.min.css"}}" rel="stylesheet">
     <link href="{{cdncss "/static/css/main.css" "version"}}" rel="stylesheet">
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="/static/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="/static/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
 </head>
 <body>
 <div class="manual-reader">
     {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+        {{template "manager/widgets.tpl" "books"}}
-                <ul class="menu">
-                    <li><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li class="active"><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                    {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
-                    <li><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-                </ul>
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/edit_users.tpl

@@ -23,17 +23,7 @@
     {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+        {{template "manager/widgets.tpl" "users"}}
-                <ul class="menu">
-                    <li><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li class="active"><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                    {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
-                    <li><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-                </ul>
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/index.tpl

@@ -24,18 +24,7 @@
     {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+        {{template "manager/widgets.tpl" "index"}}
-                <ul class="menu">
-                    <li class="active"><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                    {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
-                    <li><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-
-                </ul>
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/label_list.tpl

@@ -24,18 +24,7 @@
 {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+        {{template "manager/widgets.tpl" "label"}}
-                <ul class="menu">
-                    <li><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
-                    <li><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li class="active"><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-
-                </ul>
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/setting.tpl

@@ -23,18 +23,7 @@
     {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+        {{template "manager/widgets.tpl" "setting"}}
-                <ul class="menu">
-                    <li><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                    {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
-                    <li class="active"><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-
-                </ul>
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/users.tpl

@@ -27,19 +27,7 @@
     {{template "widgets/header.tpl" .}}
     <div class="container manual-body">
         <div class="row">
-            <div class="page-left">
+        {{template "manager/widgets.tpl" "users"}}
-                <ul class="menu">
-                    <li><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
-                    <li class="active"><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
-                    {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
-                    <li><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
-                    <li><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
-
-                </ul>
-
-            </div>
             <div class="page-right">
                 <div class="m-box">
                     <div class="box-head">

views/manager/widgets.tpl

@@ -0,0 +1,12 @@
+<div class="page-left">
+    <ul class="menu">
+        <li{{if eq "index" .}} class="active"{{end}}><a href="{{urlfor "ManagerController.Index"}}" class="item"><i class="fa fa-dashboard" aria-hidden="true"></i> 仪表盘</a> </li>
+        <li{{if eq "users" .}} class="active"{{end}}><a href="{{urlfor "ManagerController.Users" }}" class="item"><i class="fa fa-users" aria-hidden="true"></i> 用户管理</a> </li>
+        <li{{if eq "books" .}} class="active"{{end}}><a href="{{urlfor "ManagerController.Books" }}" class="item"><i class="fa fa-book" aria-hidden="true"></i> 项目管理</a> </li>
+    {{/*<li><a href="{{urlfor "ManagerController.Comments" }}" class="item"><i class="fa fa-comments-o" aria-hidden="true"></i> 评论管理</a> </li>*/}}
+        <li{{if eq "setting" .}} class="active"{{end}}><a href="{{urlfor "ManagerController.Setting" }}" class="item"><i class="fa fa-cogs" aria-hidden="true"></i> 配置管理</a> </li>
+        <li{{if eq "config" .}} class="active"{{end}}><a href="{{urlfor "ManagerController.Config" }}" class="item"><i class="fa fa-file" aria-hidden="true"></i> 配置文件</a> </li>
+        <li{{if eq "attach" .}} class="active"{{end}}><a href="{{urlfor "ManagerController.AttachList" }}" class="item"><i class="fa fa-cloud-upload" aria-hidden="true"></i> 附件管理</a> </li>
+        <li{{if eq "label" .}} class="active"{{end}}><a href="{{urlfor "ManagerController.LabelList" }}" class="item"><i class="fa fa-bookmark" aria-hidden="true"></i> 标签管理</a> </li>
+    </ul>
+</div>