Compare commits

...

5 Commits

4 changed files with 36 additions and 17 deletions

View File

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

View File

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

View File

@ -2,6 +2,7 @@ package middleware
import ( import (
"bytes" "bytes"
"io"
"io/ioutil" "io/ioutil"
"log" "log"
"net" "net"
@ -24,11 +25,24 @@ func NewLogger() gin.HandlerFunc {
latencyTime := endTime.Sub(startTime) // 请求方式 latencyTime := endTime.Sub(startTime) // 请求方式
path := c.Request.URL.Path path := c.Request.URL.Path
query := c.Request.URL.RawQuery 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() c.Next()
} }
} }

View File

@ -337,7 +337,8 @@ func UploadWithBuffer(fileBuffer *bytes.Buffer, cloudStoreSubPath string) (url s
return return
} }
cloudStoreSubPath = getEnvDir(cloudStoreSubPath) 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 return
} }
func getEnvDir(cloudStoreSubPath string) (ep string) { func getEnvDir(cloudStoreSubPath string) (ep string) {