handler/tool.go

@@ -3,7 +3,6 @@ package handler
 import (
 	"github.com/gin-gonic/gin"
 	"net/http"
-	"strconv"
 	"videoplayer/dao"
 	"videoplayer/proto"
 	"videoplayer/service"
@@ -23,7 +22,7 @@ func SetUpToolGroup(router *gin.Engine) {
 
 	//文件上传、下载
 	toolGroup.POST("/upload", UploadFile)
-	toolGroup.GET("/download", DownloadFile)
+	toolGroup.GET("/download/:filename", DownloadFile)
 }
 
 func UploadFile(c *gin.Context) {
@@ -31,7 +30,7 @@ func UploadFile(c *gin.Context) {
 	id, _ := c.Get("id")
 	id1 := int(id.(float64))
 	//从请求头获取upload_type
-	uploadType := c.PostForm("upload_type")
+	uploadType := c.Request.Header.Get("upload_type")
 	if uploadType == "" {
 		c.JSON(http.StatusOK, gin.H{"error": "upload_type is empty", "code": proto.ParameterError, "message": "failed"})
 		return
@@ -64,18 +63,16 @@ func UploadFile(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{"error": "save file info failed", "code": proto.SaveFileInfoFailed, "message": "failed"})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{"code": proto.SuccessCode, "message": "success"})
 
 }
 
 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")
 	//查询文件信息
-	//file := dao.FindFileByNames(file_id, int(id.(float64)))
+	file := dao.FindFileByNames(filename, int(id.(float64)))
-	file := dao.FindFileByID(file_id, int(id.(float64)))
 	if file.ID == 0 {
 		c.JSON(http.StatusOK, gin.H{"error": "file not found", "code": proto.FileNotFound, "message": "failed"})
 		return

main.go

@@ -50,11 +50,10 @@ func writeLogger(c *gin.Context) {
 	method := c.Request.Method
 	path := c.Request.URL.Path
 	params := ""
-
 	if method == "GET" {
 		params = c.Request.URL.RawQuery
 	}
-	if method == "POST" && !strings.Contains(c.Request.URL.Path, "/upload") {
+	if method == "POST" {
 		params = c.Request.PostForm.Encode()
 		if params == "" {
 			// 请求体
@@ -63,9 +62,6 @@ func writeLogger(c *gin.Context) {
 			params = string(bodyBytes)
 		}
 	}
-	if strings.Contains(c.Request.URL.Path, "/upload") {
-		params = "upload file"
-	}
 	go dao.InsertLogToDB(path, ip, method, params)
 }