Merge branch 'refs/heads/feat-file' into master-pg

This commit is contained in:
junleea 2024-08-30 15:03:39 +08:00
commit b6d8cece7d
2 changed files with 11 additions and 5 deletions

View File

@ -1,6 +1,7 @@
package handler package handler
import ( import (
"fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"net/http" "net/http"
"videoplayer/dao" "videoplayer/dao"
@ -31,10 +32,11 @@ func UploadFile(c *gin.Context) {
id1 := int(id.(float64)) id1 := int(id.(float64))
//从请求头获取upload_type //从请求头获取upload_type
uploadType := c.Request.Header.Get("upload_type") uploadType := c.Request.Header.Get("upload_type")
if uploadType == "" { fmt.Println("header:", c.Request.Header)
c.JSON(http.StatusOK, gin.H{"error": "upload_type is empty", "code": proto.ParameterError, "message": "failed"}) //if uploadType == "" {
return // c.JSON(http.StatusOK, gin.H{"error": "upload_type is empty", "code": proto.ParameterError, "message": "failed"})
} // return
//}
user := dao.FindUserByUserID(id1) user := dao.FindUserByUserID(id1)
if user.Upload == false { if user.Upload == false {

View File

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