fix: 解决冲突

pkg/middleware/logging.go

@@ -3,6 +3,7 @@ package middleware
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -24,14 +25,17 @@ func NewLogger() gin.HandlerFunc {
 		latencyTime := endTime.Sub(startTime) // 请求方式
 		path := c.Request.URL.Path
 		query := c.Request.URL.RawQuery
-		data, _ := io.ReadAll(c.Request.Body)
 		val := c.GetHeader("Accept-Language")
 		if val == "" {
 			c.Request.Header.Set("Accept-Language", "zh-CN")
 		}
-		log.Printf("[%s] %s %d %s %s %s %s %s %s", path, c.Request.Method, c.Writer.Status(), query,
+		if _, err := c.FormFile("file"); err != nil {
-			string(data), c.ClientIP(), c.Request.UserAgent(), c.Errors.ByType(gin.ErrorTypePrivate).String(), latencyTime.String())
+			data, _ := io.ReadAll(c.Request.Body)
-		c.Request.Body = io.NopCloser(bytes.NewBuffer(data))
+			log.Printf("[%s] %s %d %s %s %s %s %s %s", path, c.Request.Method, c.Writer.Status(), query,
+				string(data), c.ClientIP(), c.Request.UserAgent(), c.Errors.ByType(gin.ErrorTypePrivate).String(), latencyTime.String())
+
+			c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
+		}
 		c.Next()
 	}
 }

pkg/service/upload/upload.go

@@ -337,7 +337,8 @@ func UploadWithBuffer(fileBuffer *bytes.Buffer, cloudStoreSubPath string) (url s
 		return
 	}
 	cloudStoreSubPath = getEnvDir(cloudStoreSubPath)
-	url, err = Client.PutObjectFromBytes(config.ConfigData.Oss.BucketName, cloudStoreSubPath, fileBuffer.Bytes())
+	_, err = Client.PutObjectFromBytes(config.ConfigData.Oss.BucketName, cloudStoreSubPath, fileBuffer.Bytes())
+	url = config.ConfigData.Oss.CdnHost + "/" + cloudStoreSubPath
 	return
 }
 func getEnvDir(cloudStoreSubPath string) (ep string) {