ljydlv
/
videoplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/feat-file'

This commit is contained in:
junleea 2024-12-27 20:36:08 +08:00
parent 87ae7db41c fc915a0f7c
commit 720322bfd6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dao/file.go
View File

@ -18,11 +18,11 @@ type File struct {
Md5 string `gorm:"column:md5;type:varchar(255);uniqueIndex:idx_file_name"` Md5 string `gorm:"column:md5;type:varchar(255);uniqueIndex:idx_file_name"`
} }
func CreateFile(fileStoreName, fileName, fileType, filePath string, fileSize, authID int, NeedAuth bool) File { func CreateFile(fileStoreName, fileName, fileType, filePath, md5Str string, fileSize, authID int, NeedAuth bool) File {
file := File{FileStoreName: fileStoreName, FileName: fileName, FileType: fileType, FilePath: filePath, FileSize: fileSize, AuthID: authID, NeedAuth: NeedAuth} file := File{FileStoreName: fileStoreName, FileName: fileName, FileType: fileType, FilePath: filePath, FileSize: fileSize, AuthID: authID, NeedAuth: NeedAuth, Md5: md5Str}
result := DB.Create(&file) result := DB.Create(&file)
if result.Error != nil { if result.Error != nil {
return 0 return File{}
} }
return file return file
} }

17
handler/tool.go
View File

@ -126,6 +126,7 @@ func UploadFile(c *gin.Context) {
//从请求头获取upload_type //从请求头获取upload_type
uploadType := c.PostForm("upload_type") uploadType := c.PostForm("upload_type")
authType := c.PostForm("auth_type") authType := c.PostForm("auth_type")
md5_ := c.PostForm("md5")
if uploadType == "" { if uploadType == "" {
c.JSON(http.StatusOK, gin.H{"error": "upload_type is empty", "code": proto.ParameterError, "message": "failed"}) c.JSON(http.StatusOK, gin.H{"error": "upload_type is empty", "code": proto.ParameterError, "message": "failed"})
return return
@ -143,14 +144,16 @@ func UploadFile(c *gin.Context) {
return return
} }
//计算文件md5值 //计算文件md5值
file_, _ := file.Open() if md5_ == "" {
md5Value := service.CalculateFileMd5(file_) file_, _ := file.Open()
if md5Value == "" { md5_ = service.CalculateFileMd5(file_)
c.JSON(http.StatusOK, gin.H{"error": "计算文件MD5值失败", "code": proto.UploadFileFailed, "message": "failed"}) if md5_ == "" {
return c.JSON(http.StatusOK, gin.H{"error": "计算文件MD5值失败", "code": proto.UploadFileFailed, "message": "failed"})
return
}
} }
//查询文件是否已存在 //查询文件是否已存在
fileExist := dao.FindFileByMd5(md5Value) fileExist := dao.FindFileByMd5(md5_)
if fileExist.ID != 0 { if fileExist.ID != 0 {
fileExist.FilePath = "" fileExist.FilePath = ""
c.JSON(http.StatusOK, gin.H{"code": proto.SuccessCode, "message": "success", "data": fileExist}) c.JSON(http.StatusOK, gin.H{"code": proto.SuccessCode, "message": "success", "data": fileExist})
@ -173,7 +176,7 @@ func UploadFile(c *gin.Context) {
} else if authType == "private" { } else if authType == "private" {
auth_type_ = true auth_type_ = true
} }
file_record := dao.CreateFile(fileStoreName, fileName, fileType, filePath, fileSize, id1, auth_type_) file_record := dao.CreateFile(fileStoreName, fileName, fileType, filePath, md5_, fileSize, id1, auth_type_)
if file_record.ID == 0 { if file_record.ID == 0 {
c.JSON(http.StatusOK, gin.H{"error": "save file info failed", "code": proto.SaveFileInfoFailed, "message": "failed"}) c.JSON(http.StatusOK, gin.H{"error": "save file info failed", "code": proto.SaveFileInfoFailed, "message": "failed"})
return return