fixbug: document log add space id

phachon · phachon · commit eb071f5751ca · 2020-07-04T17:59:39.000+08:00
diff --git a/app/controllers/attachment.go b/app/controllers/attachment.go
@@ -156,7 +156,7 @@ func (this *AttachmentController) Upload() {
 		"path":        fmt.Sprintf("attachment/%s/%s/%s", spaceId, documentId, h.Filename),
 		"source":      models.Attachment_Source_Default,
 	}
-	_, err = models.AttachmentModel.Insert(attachment)
+	_, err = models.AttachmentModel.Insert(attachment, spaceId)
 	if err != nil {
 		_ = os.Remove(attachmentFile)
 		this.ErrorLog("上传附件错误: " + err.Error())
@@ -221,9 +221,9 @@ func (this *AttachmentController) Delete() {
 	}
 
 	// update document log
-	go func() {
-		_, _ = models.LogDocumentModel.UpdateAction(this.UserId, documentId, "删除了附件 "+attachmentName)
-	}()
+	go func(userId string, documentId string, attachmentName string, spaceId string) {
+		_, _ = models.LogDocumentModel.UpdateAction(userId, documentId, "删除了附件 "+attachmentName, spaceId)
+	}(this.UserId, documentId, attachmentName, spaceId)
 
 	redirect := fmt.Sprintf("/attachment/page?document_id=%s", documentId)
 	if attachmentSource == fmt.Sprintf("%d", models.Attachment_Source_Image) {
diff --git a/app/controllers/document.go b/app/controllers/document.go
@@ -334,7 +334,8 @@ func (this *DocumentController) Move() {
 		}
 	}
 
-	space, err := models.SpaceModel.GetSpaceBySpaceId(document["space_id"])
+	spaceId := document["space_id"]
+	space, err := models.SpaceModel.GetSpaceBySpaceId(spaceId)
 	if err != nil {
 		this.ErrorLog("移动文档失败：" + err.Error())
 		this.jsonError("移动文档失败！")
@@ -378,7 +379,8 @@ func (this *DocumentController) Move() {
 		"path":         targetDocument["path"] + "," + targetId,
 		"edit_user_id": this.UserId,
 	}
-	_, err = models.DocumentModel.MoveDBAndFile(documentId, updateValue, oldPageFile, newPageFile, document["type"], "移动文档到 "+targetDocument["name"])
+	_, err = models.DocumentModel.MoveDBAndFile(documentId, spaceId, updateValue,
+		oldPageFile, newPageFile, document["type"], "移动文档到 "+targetDocument["name"])
 	if err != nil {
 		this.ErrorLog("移动文档 " + documentId + " 失败：" + err.Error())
 		this.jsonError("移动文档失败！")
@@ -413,7 +415,7 @@ func (this *DocumentController) updateDocSequence(moveType string, document map[
 		"sequence":     updateSequence,
 		"edit_user_id": this.UserId,
 	}
-	_, err = models.DocumentModel.Update(movedDocumentId, updateValue, fmt.Sprintf("移动文档"))
+	_, err = models.DocumentModel.Update(movedDocumentId, updateValue, fmt.Sprintf("移动文档"), spaceId)
 	if err != nil {
 		this.ErrorLog("移动文档 " + movedDocumentId + "到目标文档 " + targetDocumentId + " " + moveType + " 失败：" + err.Error())
 		this.jsonError("移动文档失败！")
@@ -447,7 +449,7 @@ func (this *DocumentController) Delete() {
 			this.jsonError("请先删除或移动目录下所有文档！")
 		}
 	}
-
+	spaceId := document["space_id"]
 	space, err := models.SpaceModel.GetSpaceBySpaceId(document["space_id"])
 	if err != nil {
 		this.ErrorLog("删除文档失败：" + err.Error())
@@ -468,7 +470,7 @@ func (this *DocumentController) Delete() {
 		this.jsonError("删除文档失败！")
 	}
 
-	err = models.DocumentModel.DeleteDBAndFile(documentId, this.UserId, pageFile, document["type"])
+	err = models.DocumentModel.DeleteDBAndFile(documentId, spaceId, this.UserId, pageFile, document["type"])
 	if err != nil {
 		this.ErrorLog("删除文档 " + documentId + " 失败：" + err.Error())
 		this.jsonError("删除文档失败！")
diff --git a/app/controllers/image.go b/app/controllers/image.go
@@ -101,7 +101,7 @@ func (this *ImageController) Upload() {
 		"path":        fmt.Sprintf("images/%s/%s/%s", spaceId, documentId, h.Filename),
 		"source":      models.Attachment_Source_Image,
 	}
-	_, err = models.AttachmentModel.Insert(attachment)
+	_, err = models.AttachmentModel.Insert(attachment, spaceId)
 	if err != nil {
 		_ = os.Remove(imageFile)
 		this.ErrorLog("上传图片保存信息错误: " + err.Error())
diff --git a/app/controllers/page.go b/app/controllers/page.go
@@ -249,7 +249,7 @@ func (this *PageController) Modify() {
 		"name":         newName,
 		"edit_user_id": this.UserId,
 	}
-	_, err = models.DocumentModel.UpdateDBAndFile(documentId, document, documentContent, updateValue, comment)
+	_, err = models.DocumentModel.UpdateDBAndFile(documentId, spaceId, document, documentContent, updateValue, comment)
 	if err != nil {
 		this.ErrorLog("修改文档 " + documentId + " 失败：" + err.Error())
 		this.jsonError("修改文档失败！")
@@ -271,9 +271,9 @@ func (this *PageController) Modify() {
 	}
 	// follow doc
 	if isFollowDoc == "1" {
-		go func() {
-			_, _ = models.FollowModel.FollowDocument(this.UserId, documentId)
-		}()
+		go func(userId string, documentId string) {
+			_, _ = models.FollowModel.FollowDocument(userId, documentId)
+		}(this.UserId, documentId)
 	}
 	// 更新文档索引
 	go func(documentId string) {
diff --git a/app/models/attachment.go b/app/models/attachment.go
@@ -151,7 +151,7 @@ func (a *Attachment) Delete(attachmentId string) (err error) {
 }
 
 // insert attachment
-func (a *Attachment) Insert(attachmentValue map[string]interface{}) (id int64, err error) {
+func (a *Attachment) Insert(attachmentValue map[string]interface{}, spaceId string) (id int64, err error) {
 
 	attachmentValue["create_time"] = time.Now().Unix()
 	attachmentValue["update_time"] = time.Now().Unix()
@@ -164,14 +164,14 @@ func (a *Attachment) Insert(attachmentValue map[string]interface{}) (id int64, e
 	id = rs.LastInsertId
 
 	// create document log
-	go func() {
+	go func(attachmentValue map[string]interface{}, spaceId string) {
 		comment := fmt.Sprintf("上传了附件 %s", attachmentValue["name"].(string))
 		if attachmentValue["source"].(int) == Attachment_Source_Image {
 			comment = fmt.Sprintf("上传了图片 %s", attachmentValue["name"].(string))
 		}
 		_, _ = LogDocumentModel.UpdateAction(attachmentValue["user_id"].(string),
-			attachmentValue["document_id"].(string), comment)
-	}()
+			attachmentValue["document_id"].(string), comment, spaceId)
+	}(attachmentValue, spaceId)
 
 	return
 }
diff --git a/app/models/document.go b/app/models/document.go
@@ -157,7 +157,7 @@ func (d *Document) GetDocumentMaxSequence(parentId string, spaceId string) (sequ
 }
 
 // delete document by document_id
-func (d *Document) DeleteDBAndFile(documentId string, userId string, pageFile string, docType string) (err error) {
+func (d *Document) DeleteDBAndFile(documentId string, spaceId string, userId string, pageFile string, docType string) (err error) {
 	db := G.DB()
 	tx, err := db.Begin(db.Config)
 	if err != nil {
@@ -188,12 +188,12 @@ func (d *Document) DeleteDBAndFile(documentId string, userId string, pageFile st
 	}
 
 	// create document log
-	go func(userId, documentId string) {
-		_, err := LogDocumentModel.DeleteAction(userId, documentId)
+	go func(userId, documentId string, spaceId string) {
+		_, err := LogDocumentModel.DeleteAction(userId, documentId, spaceId)
 		if err != nil {
 			logs.Error("delete document add log err=%s", err.Error())
 		}
-	}(userId, documentId)
+	}(userId, documentId, spaceId)
 
 	// delete follow doc
 	go func(documentId string) {
@@ -285,7 +285,7 @@ func (d *Document) Insert(documentValue map[string]interface{}) (id int64, err e
 }
 
 // update document by document_id
-func (d *Document) Update(documentId string, documentValue map[string]interface{}, comment string) (id int64, err error) {
+func (d *Document) Update(documentId string, documentValue map[string]interface{}, comment string, spaceId string) (id int64, err error) {
 	db := G.DB()
 	var rs *mysql.ResultSet
 	documentValue["update_time"] = time.Now().Unix()
@@ -299,12 +299,12 @@ func (d *Document) Update(documentId string, documentValue map[string]interface{
 	id = rs.LastInsertId
 
 	// update document log
-	go func(editUserId string, documentId string, comment string) {
-		_, err := LogDocumentModel.UpdateAction(editUserId, documentId, comment)
+	go func(editUserId string, documentId string, comment string, spaceId string) {
+		_, err := LogDocumentModel.UpdateAction(editUserId, documentId, comment, spaceId)
 		if err != nil {
 			logs.Error("update document add log err=%s", err.Error())
 		}
-	}(documentValue["edit_user_id"].(string), documentId, comment)
+	}(documentValue["edit_user_id"].(string), documentId, comment, spaceId)
 
 	// follow document
 	go func(editUserId string, documentId string) {
@@ -340,7 +340,8 @@ func (d *Document) MoveSequenceBySpaceIdAndGtSequence(spaceId string, startSeque
 }
 
 // move document
-func (d *Document) MoveDBAndFile(documentId string, updateValue map[string]interface{}, oldPageFile string, newPageFile string, docType string, comment string) (id int64, err error) {
+func (d *Document) MoveDBAndFile(documentId string, spaceId string, updateValue map[string]interface{},
+	oldPageFile string, newPageFile string, docType string, comment string) (id int64, err error) {
 
 	db := G.DB()
 	tx, err := db.Begin(db.Config)
@@ -370,18 +371,18 @@ func (d *Document) MoveDBAndFile(documentId string, updateValue map[string]inter
 	}
 
 	// create document log
-	go func(userId, documentId, comment string) {
-		_, err := LogDocumentModel.UpdateAction(updateValue["edit_user_id"].(string), documentId, comment)
+	go func(userId, documentId, comment string, spaceId string) {
+		_, err := LogDocumentModel.UpdateAction(updateValue["edit_user_id"].(string), documentId, comment, spaceId)
 		if err != nil {
 			logs.Error("update document add log err=%s", err.Error())
 		}
-	}(updateValue["edit_user_id"].(string), documentId, comment)
+	}(updateValue["edit_user_id"].(string), documentId, comment, spaceId)
 
 	return
 }
 
 // update document by document_id
-func (d *Document) UpdateDBAndFile(documentId string, document map[string]string, documentContent string, updateValue map[string]interface{}, comment string) (id int64, err error) {
+func (d *Document) UpdateDBAndFile(documentId string, spaceId string, document map[string]string, documentContent string, updateValue map[string]interface{}, comment string) (id int64, err error) {
 
 	// get document page file
 	_, oldPageFile, err := DocumentModel.GetParentDocumentsByDocument(document)
@@ -425,14 +426,14 @@ func (d *Document) UpdateDBAndFile(documentId string, document map[string]string
 	}
 
 	// create document log
-	go func() {
-		LogDocumentModel.UpdateAction(updateValue["edit_user_id"].(string), documentId, comment)
-	}()
+	go func(documentId string, comment string, spaceId string) {
+		_, _ = LogDocumentModel.UpdateAction(updateValue["edit_user_id"].(string), documentId, comment, spaceId)
+	}(documentId, comment, spaceId)
 
 	// create follow doc
-	go func() {
-		FollowModel.CreateAutoFollowDocument(updateValue["edit_user_id"].(string), documentId)
-	}()
+	go func(documentId string) {
+		_, _ = FollowModel.CreateAutoFollowDocument(updateValue["edit_user_id"].(string), documentId)
+	}(documentId)
 
 	return
 }
diff --git a/app/models/log_document.go b/app/models/log_document.go
@@ -55,21 +55,23 @@ func (ld *LogDocument) CreateAction(userId string, documentId string, spaceId st
 	return ld.Insert(logDocument)
 }
 
-func (ld *LogDocument) UpdateAction(userId string, documentId string, comment string) (id int64, err error) {
+func (ld *LogDocument) UpdateAction(userId string, documentId string, comment string, spaceId string) (id int64, err error) {
 	logDocument := map[string]interface{}{
 		"user_id":     userId,
 		"document_id": documentId,
+		"space_id":    spaceId,
 		"comment":     comment,
 		"action":      LogDocument_Action_Update,
 		"create_time": time.Now().Unix(),
 	}
 	return ld.Insert(logDocument)
 }
 
-func (ld *LogDocument) DeleteAction(userId string, documentId string) (id int64, err error) {
+func (ld *LogDocument) DeleteAction(userId string, documentId string, spaceId string) (id int64, err error) {
 	logDocument := map[string]interface{}{
 		"user_id":     userId,
 		"document_id": documentId,
+		"space_id":    spaceId,
 		"comment":     "删除了该文档",
 		"action":      LogDocument_Action_Delete,
 		"create_time": time.Now().Unix(),
diff --git a/app/modules/system/controllers/contact.go b/app/modules/system/controllers/contact.go
@@ -196,4 +196,4 @@ func (this *ContactController) Import() {
 	this.Data["username"] = username
 	this.SetPaginator(number, count)
 	this.viewLayout("contact/import", "contact")
-}
+}
diff --git a/app/modules/system/controllers/plugin.go b/app/modules/system/controllers/plugin.go
@@ -95,4 +95,4 @@ func (this *PluginController) ConfigModify() {
 		this.jsonError("修改插件配置失败")
 	}
 	this.jsonSuccess("修改插件配置成功", nil, "/system/plugin/list")
-}
+}
diff --git a/app/modules/system/controllers/space.go b/app/modules/system/controllers/space.go
@@ -303,7 +303,8 @@ func (this *SpaceController) Delete() {
 				this.ErrorLog("删除空间 " + spaceId + " 获取空间文件失败: " + err.Error())
 				this.jsonError("删除空间失败")
 			}
-			err = models.DocumentModel.DeleteDBAndFile(documents[0]["document_id"], this.UserId, pageFile, fmt.Sprintf("%d", models.Document_Type_Dir))
+			err = models.DocumentModel.DeleteDBAndFile(documents[0]["document_id"], spaceId, this.UserId,
+				pageFile, fmt.Sprintf("%d", models.Document_Type_Dir))
 			// delete space document attachments
 			_ = models.AttachmentModel.DeleteAttachmentsDBFileByDocumentId(documents[0]["document_id"])
 		}

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (this *ImageController) Upload() {`
`101`	`101`	`"path": fmt.Sprintf("images/%s/%s/%s", spaceId, documentId, h.Filename),`
`102`	`102`	`"source": models.Attachment_Source_Image,`
`103`	`103`	`}`
`104`		`- _, err = models.AttachmentModel.Insert(attachment)`
	`104`	`+ _, err = models.AttachmentModel.Insert(attachment, spaceId)`
`105`	`105`	`if err != nil {`
`106`	`106`	`_ = os.Remove(imageFile)`
`107`	`107`	`this.ErrorLog("上传图片保存信息错误: " + err.Error())`
Original file line number	Diff line number	Diff line change
`@@ -95,4 +95,4 @@ func (this *PluginController) ConfigModify() {`
`95`	`95`	`this.jsonError("修改插件配置失败")`
`96`	`96`	`}`
`97`	`97`	`this.jsonSuccess("修改插件配置成功", nil, "/system/plugin/list")`
`98`		`-}`
	`98`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,8 @@ func (this *SpaceController) Delete() {`
`303`	`303`	`this.ErrorLog("删除空间 " + spaceId + " 获取空间文件失败: " + err.Error())`
`304`	`304`	`this.jsonError("删除空间失败")`
`305`	`305`	`}`
`306`		`- err = models.DocumentModel.DeleteDBAndFile(documents[0]["document_id"], this.UserId, pageFile, fmt.Sprintf("%d", models.Document_Type_Dir))`
	`306`	`+ err = models.DocumentModel.DeleteDBAndFile(documents[0]["document_id"], spaceId, this.UserId,`
	`307`	`+ pageFile, fmt.Sprintf("%d", models.Document_Type_Dir))`
`307`	`308`	`// delete space document attachments`
`308`	`309`	`_ = models.AttachmentModel.DeleteAttachmentsDBFileByDocumentId(documents[0]["document_id"])`
`309`	`310`	`}`