fixed: flipped-aurora#862

hezohngkai · Dec 31, 2021 · 722ad31 · 722ad31
1 parent 7a6939e
commit 722ad31
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/server/api/v1/example/exa_breakpoint_continue.go b/server/api/v1/example/exa_breakpoint_continue.go
@@ -2,6 +2,7 @@ package example
 
 import (
 	"fmt"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
 	"io/ioutil"
 	"mime/multipart"
 	"strconv"
@@ -123,11 +124,17 @@ func (b *FileUploadAndDownloadApi) BreakpointContinueFinish(c *gin.Context) {
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"缓存切片删除成功"}"
 // @Router /fileUploadAndDownload/removeChunk [post]
 func (u *FileUploadAndDownloadApi) RemoveChunk(c *gin.Context) {
-	fileMd5 := c.Query("fileMd5")
-	err := utils.RemoveChunk(fileMd5)
+	var file example.ExaFile
+	c.ShouldBindJSON(&file)
+	err := utils.RemoveChunk(file.FileMd5)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = fileUploadAndDownloadService.DeleteFileChunk(file.FileMd5, file.FileName, file.FilePath)
 	if err != nil {
-		global.GVA_LOG.Error("缓存切片删除失败!", zap.Error(err))
-		response.FailWithMessage( "缓存切片删除失败", c)
+		global.GVA_LOG.Error(err.Error(), zap.Error(err))
+		response.FailWithMessage(err.Error(), c)
 	} else {
 		response.OkWithMessage("缓存切片删除成功", c)
 	}

diff --git a/server/service/example/exa_breakpoint_continue.go b/server/service/example/exa_breakpoint_continue.go
@@ -56,7 +56,7 @@ func (e *FileUploadAndDownloadService) CreateFileChunk(id uint, fileChunkPath st
 func (e *FileUploadAndDownloadService) DeleteFileChunk(fileMd5 string, fileName string, filePath string) error {
 	var chunks []example.ExaFileChunk
 	var file example.ExaFile
-	err := global.GVA_DB.Where("file_md5 = ? AND file_name = ?", fileMd5, fileName).First(&file).Update("IsFinish", true).Update("file_path", filePath).Error
+	err := global.GVA_DB.Where("file_md5 = ? ", fileMd5).First(&file).Update("IsFinish", true).Update("file_path", filePath).Error
 	if err != nil {
 		return err
 	}

diff --git a/web/src/view/example/breakpoint/breakpoint.vue b/web/src/view/example/breakpoint/breakpoint.vue
@@ -160,9 +160,11 @@ const upLoadFileSlice = async(item) => {
     if (res.code === 0) {
       // 合成文件过后 删除缓存切片
       const params = {
+        fileName: file.value.name,
         fileMd5: fileMd5.value,
+        filePath: res.data.filePath,
       }
-      ElMessage.success(上传成功)
+      ElMessage.success("上传成功")
       await removeChunk(params)
     }
   }