From ea3769142ef12abf9dde7a88e3c2029cb3a8a192 Mon Sep 17 00:00:00 2001 From: YuleiLan Date: Wed, 28 Oct 2020 10:11:34 +0800 Subject: [PATCH 1/2] fix: fix bug. --- apis/public/file.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apis/public/file.go b/apis/public/file.go index b3b9e3c..f123682 100644 --- a/apis/public/file.go +++ b/apis/public/file.go @@ -33,6 +33,7 @@ func UploadFile(c *gin.Context) { saveFilePath string err error protocol string = "http" + requestHost string ) tag, _ = c.GetPostForm("type") fileType = c.DefaultQuery("file_type", "images") @@ -46,8 +47,15 @@ func UploadFile(c *gin.Context) { protocol = "https" } + requestHostList := strings.Split(c.Request.Host, ":") + if len(requestHostList) > 0 && requestHostList[1] == "80" { + requestHost = requestHostList[0] + } else { + requestHost = c.Request.Host + } + if viper.GetBool("settings.domain.getHost") { - urlPrefix = fmt.Sprintf("%s://%s/", protocol, c.Request.Host) + urlPrefix = fmt.Sprintf("%s://%s/", protocol, requestHost) } else { if strings.HasSuffix(viper.GetString("settings.domain.url"), "/") { urlPrefix = viper.GetString("settings.domain.url") From fea43a65ea31a5ab176f7d1de120a17cb15e4294 Mon Sep 17 00:00:00 2001 From: YuleiLan Date: Wed, 28 Oct 2020 10:51:35 +0800 Subject: [PATCH 2/2] fix: fix bug. --- apis/public/file.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apis/public/file.go b/apis/public/file.go index f123682..ad3321f 100644 --- a/apis/public/file.go +++ b/apis/public/file.go @@ -57,10 +57,9 @@ func UploadFile(c *gin.Context) { if viper.GetBool("settings.domain.getHost") { urlPrefix = fmt.Sprintf("%s://%s/", protocol, requestHost) } else { - if strings.HasSuffix(viper.GetString("settings.domain.url"), "/") { - urlPrefix = viper.GetString("settings.domain.url") - } else { - urlPrefix = fmt.Sprintf("%s://%s/", protocol, viper.GetString("settings.domain.url")) + urlPrefix = fmt.Sprintf("%s://%s", protocol, viper.GetString("settings.domain.url")) + if !strings.HasSuffix(viper.GetString("settings.domain.url"), "/") { + urlPrefix = urlPrefix + "/" } }