文档版本控制，版本修改commit

TruthHun88 · TruthHun88 · commit 746e16b8d17a · 2018-09-22T11:49:05.000+08:00
diff --git a/controllers/DocumentController.go b/controllers/DocumentController.go
@@ -35,6 +35,23 @@ type DocumentController struct {
 	BaseController
 }
 
+// &#35299;&#26512;&#24182;&#25552;&#21462;&#29256;&#26412;&#25511;&#21046;&#30340;commit&#20869;&#23481;
+func parseGitCommit(str string) (cont, commit string) {
+	var slice []string
+	arr := strings.Split(str, "<git>")
+	if len(arr) > 1 {
+		slice = append(slice, arr[0])
+	}
+	str = strings.Join(arr[1:], "")
+	arr = strings.Split(str, "</git>")
+	if len(arr) > 1 {
+		slice = append(slice, arr[1:]...)
+		commit = arr[0]
+	}
+	cont = strings.Join(slice, "")
+	return
+}
+
 //&#21028;&#26029;&#29992;&#25143;&#26159;&#21542;&#21487;&#20197;&#38405;&#35835;&#25991;&#26723;.
 func isReadable(identify, token string, this *DocumentController) *models.BookResult {
 	book, err := models.NewBook().FindByFieldFirst("identify", identify)
@@ -877,14 +894,24 @@ func (this *DocumentController) Content() {
 		content = this.replaceLinks(identify, content, is_summary)
 
 		var ds = models.DocumentStore{}
+		var actionName string
 
+		// &#26367;&#25442;&#25481;<git></git>&#26631;&#31614;&#20869;&#23481;
 		if markdown == "" && content != "" {
 			ds.Markdown = content
 		} else {
 			ds.Markdown = markdown
 		}
+
+		ds.Markdown, actionName = parseGitCommit(ds.Markdown)
+		ds.Content, _ = parseGitCommit(content)
+		if actionName == "" {
+			actionName = "&#20462;&#25913;&#25991;&#26723;"
+		} else {
+			is_auto = true
+		}
+
 		doc.Version = time.Now().Unix()
-		ds.Content = content
 		if doc_id, err := doc.InsertOrUpdate(); err != nil {
 			beego.Error("InsertOrUpdate => ", err)
 			this.JsonResult(6006, "&#20445;&#23384;&#22833;&#36133;")
@@ -894,33 +921,41 @@ func (this *DocumentController) Content() {
 				beego.Error(err)
 			}
 		}
+
 		// TODO:&#20869;&#23481;&#23384;&#20648;&#20026;&#25991;&#26723;
 		//&#22914;&#26524;&#21551;&#29992;&#20102;&#25991;&#26723;&#21382;&#21490;&#65292;&#21017;&#28155;&#21152;&#21382;&#21490;&#25991;&#26723;
 		if this.EnableDocumentHistory > 0 {
-			history := models.NewDocumentHistory()
-			history.DocumentId = doc_id
-			history.DocumentName = doc.DocumentName
-			history.ModifyAt = this.Member.MemberId
-			history.MemberId = doc.MemberId
-			history.ParentId = doc.ParentId
-			history.Version = time.Now().Unix()
-			history.Action = "modify"
-			history.ActionName = "&#20462;&#25913;&#25991;&#26723;"
-
-			vc := models.NewVersionControl(doc_id, history.Version)
-			vc.SaveVersion(ds.Content, ds.Markdown)
-
-			_, err = history.InsertOrUpdate()
-			if err != nil {
-				beego.Error("DocumentHistory InsertOrUpdate => ", err)
+			dom, err := goquery.NewDocumentFromReader(strings.NewReader(ds.Content))
+			if err == nil && len(dom.Text()) > 0 { //&#31354;&#20869;&#23481;&#19981;&#23384;&#20648;&#29256;&#26412;
+				history := models.NewDocumentHistory()
+				history.DocumentId = doc_id
+				history.DocumentName = doc.DocumentName
+				history.ModifyAt = this.Member.MemberId
+				history.MemberId = doc.MemberId
+				history.ParentId = doc.ParentId
+				history.Version = time.Now().Unix()
+				history.Action = "modify"
+				history.ActionName = actionName
+
+				vc := models.NewVersionControl(doc_id, history.Version)
+				vc.SaveVersion(ds.Content, ds.Markdown)
+
+				_, err = history.InsertOrUpdate()
+				if err != nil {
+					beego.Error("DocumentHistory InsertOrUpdate => ", err)
+				}
 			}
+
 		}
+
 		if is_auto {
 			errMsg = "auto"
 		} else if is_summary {
 			errMsg = "true"
 		}
 
+		beego.Error("IS_AUTO====", is_auto, actionName, ds.Content)
+
 		//
 		//doc.Content = ""
 		doc.Release = ""
@@ -989,117 +1024,6 @@ func (this *DocumentController) Export() {
 
 }
 
-//&#23548;&#20986;&#25991;&#20214;
-//func (this *DocumentController) Export() {
-//	this.TplName = "document/export.html"
-//	identify := this.Ctx.Input.Param(":key")
-//	output := this.GetString("output")
-//	token := this.GetString("token")
-//	if identify == "" {
-//		this.Abort("404")
-//	}
-//
-//	//&#22914;&#26524;&#27809;&#26377;&#24320;&#21551;&#20320;&#20204;&#35775;&#38382;&#21017;&#36339;&#36716;&#21040;&#30331;&#24405;
-//	if !this.EnableAnonymous && this.Member == nil {
-//		this.Redirect(beego.URLFor("AccountController.Login"), 302)
-//		return
-//	}
-//	bookResult := models.NewBookResult()
-//	if this.Member != nil && this.Member.IsAdministrator() {
-//		book, err := models.NewBook().FindByIdentify(identify)
-//		if err != nil {
-//			beego.Error(err)
-//			this.Abort("500")
-//		}
-//		bookResult = book.ToBookResult()
-//	} else {
-//		bookResult = isReadable(identify, token, this)
-//	}
-//
-//	if bookResult.PrivatelyOwned == 0 {
-//		//TODO &#31169;&#26377;&#39033;&#30446;&#31105;&#27490;&#23548;&#20986;
-//	}
-//
-//	docs, err := models.NewDocument().FindListByBookId(bookResult.BookId)
-//
-//	if err != nil {
-//		beego.Error(err)
-//		this.Abort("500")
-//	}
-//
-//	if output == "pdf" {
-//
-//		exe := beego.AppConfig.String("wkhtmltopdf")
-//
-//		if exe == "" {
-//			this.TplName = "errors/error.html"
-//			this.Data["ErrorMessage"] = "&#27809;&#26377;&#37197;&#32622;PDF&#23548;&#20986;&#31243;&#24207;"
-//			this.Data["ErrorCode"] = 50010
-//			return
-//		}
-//		dpath := "cache/" + bookResult.Identify
-//
-//		os.MkdirAll(dpath, 0766)
-//
-//		pathList := list.New()
-//
-//		RecursiveFun(0, "", dpath, this, bookResult, docs, pathList)
-//
-//		defer os.RemoveAll(dpath)
-//
-//		os.MkdirAll("./cache", 0766)
-//		pdfpath := filepath.Join("cache", identify+"_"+this.CruSession.SessionID()+".pdf")
-//
-//		if _, err := os.Stat(pdfpath); os.IsNotExist(err) {
-//
-//			wkhtmltopdf.SetPath(beego.AppConfig.String("wkhtmltopdf"))
-//			pdfg, err := wkhtmltopdf.NewPDFGenerator()
-//			pdfg.PageSize.Set(wkhtmltopdf.PageSizeA4)
-//			pdfg.MarginBottom.Set(25)
-//
-//			if err != nil {
-//				beego.Error(err)
-//				this.Abort("500")
-//			}
-//
-//			for e := pathList.Front(); e != nil; e = e.Next() {
-//				if page, ok := e.Value.(string); ok {
-//					pdfg.AddPage(wkhtmltopdf.NewPage(page))
-//				}
-//			}
-//			pdfg.MoreArgs = append(pdfg.MoreArgs,
-//				"--header-font-size", "8",
-//				"--footer-right", "[page] / [toPage]",
-//				"--footer-spacing", "5",
-//				"--footer-html", "views/widgets/pdf_footer.html",
-//				"--footer-font-size", "8",
-//			)
-//			//beego.Debug(pdfg.ArgString())
-//			//TODO &#22788;&#29702;&#39029;&#30721;&#21644;footer&#12289;header&#38382;&#39064;
-//			//this.JsonResult(0, "1", pdfg.ArgString())
-//
-//			err = pdfg.Create()
-//			if err != nil {
-//				beego.Error(err)
-//				this.Abort("500")
-//			}
-//
-//			err = pdfg.WriteFile(pdfpath)
-//			if err != nil {
-//				beego.Error(err)
-//			}
-//		}
-//
-//		this.Ctx.Output.Download(pdfpath, bookResult.BookName+".pdf")
-//
-//		defer os.Remove(pdfpath)
-//
-//		this.StopRun()
-//	}
-//
-//	this.Abort("404")
-//}
-
 //&#29983;&#25104;&#39033;&#30446;&#35775;&#38382;&#30340;&#20108;&#32500;&#30721;.
 
 func (this *DocumentController) QrCode() {
