XinanXf/ferry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/lanyulei/ferry2 into dev

Browse Source
This commit is contained in:
Mr. Lan 2020-11-02 21:42:02 +08:00
commit 536a4c5686
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apis/public/file.go
View File

@ -33,6 +33,7 @@ func UploadFile(c *gin.Context) {
saveFilePath string saveFilePath string
err error err error
protocol string = "http" protocol string = "http"
requestHost string
) )
tag, _ = c.GetPostForm("type") tag, _ = c.GetPostForm("type")
fileType = c.DefaultQuery("file_type", "images") fileType = c.DefaultQuery("file_type", "images")
@ -46,13 +47,19 @@ func UploadFile(c *gin.Context) {
protocol = "https" 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") { if viper.GetBool("settings.domain.getHost") {
urlPrefix = fmt.Sprintf("%s://%s/", protocol, c.Request.Host) urlPrefix = fmt.Sprintf("%s://%s/", protocol, requestHost)
} else { } else {
if strings.HasSuffix(viper.GetString("settings.domain.url"), "/") { urlPrefix = fmt.Sprintf("%s://%s", protocol, viper.GetString("settings.domain.url"))
urlPrefix = viper.GetString("settings.domain.url") if !strings.HasSuffix(viper.GetString("settings.domain.url"), "/") {
} else { urlPrefix = urlPrefix + "/"
urlPrefix = fmt.Sprintf("%s://%s/", protocol, viper.GetString("settings.domain.url"))
} }
} }