Merge branch 'refs/heads/feat-file' into master-pg
This commit is contained in:
commit
45fa575f19
|
|
@ -3,6 +3,7 @@ package handler
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"strconv"
|
||||||
"videoplayer/dao"
|
"videoplayer/dao"
|
||||||
"videoplayer/proto"
|
"videoplayer/proto"
|
||||||
"videoplayer/service"
|
"videoplayer/service"
|
||||||
|
|
@ -22,7 +23,7 @@ func SetUpToolGroup(router *gin.Engine) {
|
||||||
|
|
||||||
//文件上传、下载
|
//文件上传、下载
|
||||||
toolGroup.POST("/upload", UploadFile)
|
toolGroup.POST("/upload", UploadFile)
|
||||||
toolGroup.GET("/download/:filename", DownloadFile)
|
toolGroup.GET("/download", DownloadFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
func UploadFile(c *gin.Context) {
|
func UploadFile(c *gin.Context) {
|
||||||
|
|
@ -63,16 +64,18 @@ func UploadFile(c *gin.Context) {
|
||||||
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
|
||||||
}
|
}
|
||||||
|
c.JSON(http.StatusOK, gin.H{"code": proto.SuccessCode, "message": "success"})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func DownloadFile(c *gin.Context) {
|
func DownloadFile(c *gin.Context) {
|
||||||
//参数
|
//参数
|
||||||
filename := c.Param("filename")
|
//filename := c.Param("filename")
|
||||||
//file_id, _ := strconv.Atoi(c.Query("id"))
|
file_id, _ := strconv.Atoi(c.Query("id"))
|
||||||
id, _ := c.Get("id")
|
id, _ := c.Get("id")
|
||||||
//查询文件信息
|
//查询文件信息
|
||||||
file := dao.FindFileByNames(filename, int(id.(float64)))
|
//file := dao.FindFileByNames(file_id, int(id.(float64)))
|
||||||
|
file := dao.FindFileByID(file_id, int(id.(float64)))
|
||||||
if file.ID == 0 {
|
if file.ID == 0 {
|
||||||
c.JSON(http.StatusOK, gin.H{"error": "file not found", "code": proto.FileNotFound, "message": "failed"})
|
c.JSON(http.StatusOK, gin.H{"error": "file not found", "code": proto.FileNotFound, "message": "failed"})
|
||||||
return
|
return
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue