conf/conf.ini

@@ -13,15 +13,13 @@ BosUrl = ".bj.bcebos.com"
 BosBaseDir = "fonchain-main"
 BosHttp = "https://"
 BosDomain = "cdns.fontree.cn"
-
 [oss]
-AccessKeyId="LTAI5tLz1fSK53FQAEC9uNSb"
+AccessKeyId =   "LTAI5tHfjSmWXHqfWgaL7Uo5"
-AccessKeysecret ="oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
+AccessKeySecret = "kOPctFZ3DHsbdSSym1fLyDK39hkzPI"
-Endpoint = "oss-cn-hangzhou.aliyuncs.com"
+Endpoint =      "oss-cn-hangzhou-internal.aliyuncs.com"
-BucketName = "fontree-test"
+BucketName =    "erp-k8s-store"
-BaseDir  = "artistinfo"
+BaseDir =      "fiee"
-CdnHost = "https://cdn-test.szjixun.cn"
+CdnHost =      "https://e-cdn.fontree.cn"
-
 [redis]
 RedisDB = "2"
 RedisAddr = "127.0.0.1:6379"

docs/test/conf.ini

@@ -12,15 +12,13 @@ BucketName =  "dci-file-new"
 BosUrl = ".bj.bcebos.com"
 BosBaseDir = "fonchain-main"
 BosHttp = "https://"
-
 [oss]
-AccessKeyId="LTAI5tLz1fSK53FQAEC9uNSb"
+AccessKeyId =   "LTAI5tHfjSmWXHqfWgaL7Uo5"
-AccessKeysecret ="oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
+AccessKeySecret = "kOPctFZ3DHsbdSSym1fLyDK39hkzPI"
-Endpoint = "oss-cn-hangzhou.aliyuncs.com"
+Endpoint =      "oss-cn-hangzhou-internal.aliyuncs.com"
-BucketName = "fontree-test"
+BucketName =    "erp-k8s-store"
-BaseDir  = "fiee"
+BaseDir =      "fiee"
-CdnHost = "https://cdn-test.szjixun.cn"
+CdnHost =      "https://e-cdn.fontree.cn"
-
 [redis]
 RedisDB = "2"
 RedisAddr = "redis:6379"

pkg/middleware/logging.go

@@ -2,7 +2,6 @@ package middleware
 
 import (
 	"bytes"
-	"io"
 	"io/ioutil"
 	"log"
 	"net"
@@ -25,24 +24,11 @@ func NewLogger() gin.HandlerFunc {
 		latencyTime := endTime.Sub(startTime) // 请求方式
 		path := c.Request.URL.Path
 		query := c.Request.URL.RawQuery
-		if _, err := c.FormFile("file"); err != nil {
+		data, _ := ioutil.ReadAll(c.Request.Body)
-			data, _ := ioutil.ReadAll(c.Request.Body)
+		log.Printf("[%s] %s %d %s %s %s %s %s %s", path, c.Request.Method, c.Writer.Status(), query,
-			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())
-				string(data), c.ClientIP(), c.Request.UserAgent(), c.Errors.ByType(gin.ErrorTypePrivate).String(), latencyTime.String())
 
-			c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
+		c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
-		}
-		val := c.GetHeader("Accept-Language")
-		if val == "" {
-			c.Request.Header.Set("Accept-Language", "zh-CN")
-		}
-		if _, err := c.FormFile("file"); err != nil {
-			data, _ := io.ReadAll(c.Request.Body)
-			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,8 +337,7 @@ func UploadWithBuffer(fileBuffer *bytes.Buffer, cloudStoreSubPath string) (url s
 		return
 	}
 	cloudStoreSubPath = getEnvDir(cloudStoreSubPath)
-	_, err = Client.PutObjectFromBytes(config.ConfigData.Oss.BucketName, cloudStoreSubPath, fileBuffer.Bytes())
+	url, err = Client.PutObjectFromBytes(config.ConfigData.Oss.BucketName, cloudStoreSubPath, fileBuffer.Bytes())
-	url = config.ConfigData.Oss.CdnHost + "/" + cloudStoreSubPath
 	return
 }
 func getEnvDir(cloudStoreSubPath string) (ep string) {