diff --git a/apis/public/file.go b/apis/public/file.go index 6d46b41..f62ae44 100644 --- a/apis/public/file.go +++ b/apis/public/file.go @@ -27,15 +27,21 @@ import ( func UploadFile(c *gin.Context) { var ( - tag string urlPrefix string + tag string ) tag, _ = c.GetPostForm("type") - if strings.HasSuffix(viper.GetString("settings.domain"), "/") { - urlPrefix = viper.GetString("settings.domain") + + if viper.GetBool("settings.domain.getHost") { + urlPrefix = fmt.Sprintf("http://%s/", c.Request.Host) } else { - urlPrefix = fmt.Sprintf("%v/", viper.GetString("settings.domain")) + if strings.HasSuffix(viper.GetString("settings.domain.url"), "/") { + urlPrefix = viper.GetString("settings.domain.url") + } else { + urlPrefix = fmt.Sprintf("http://%s/", viper.GetString("settings.domain.url")) + } } + if tag == "" { app.Error(c, 200, errors.New(""), "缺少标识") return diff --git a/config/settings.dev.yml b/config/settings.dev.yml index b24f849..1765c9f 100644 --- a/config/settings.dev.yml +++ b/config/settings.dev.yml @@ -17,7 +17,9 @@ settings: password: your password port: 3306 username: ferry - domain: http://192.168.0.100:9527 + domain: + gethost: 1 + url: localhost:9527 email: alias: ferry host: smtp.163.com diff --git a/pkg/notify/send.go b/pkg/notify/send.go index ab2c5f6..d54b075 100644 --- a/pkg/notify/send.go +++ b/pkg/notify/send.go @@ -42,7 +42,7 @@ func (b *BodyData) ParsingTemplate() (err error) { return } - b.Domain = viper.GetString("settings.domain") + b.Domain = viper.GetString("settings.domain.url") err = tmpl.Execute(&buf, b) if err != nil { return