fix!: check https with X-Forwarded-Proto

not read old setting `api_url` and `base_path` from this commit
This commit is contained in:
Noah Hsu
2023-01-19 12:16:42 +08:00
parent bc1babb5b5
commit ce4a295008
3 changed files with 9 additions and 14 deletions

View File

@ -5,7 +5,6 @@ import (
"strings"
"github.com/alist-org/alist/v3/internal/conf"
"github.com/alist-org/alist/v3/internal/setting"
"github.com/alist-org/alist/v3/pkg/utils"
)
@ -25,11 +24,6 @@ func getSiteConfig() SiteConfig {
BasePath: u.Path,
Cdn: strings.ReplaceAll(strings.TrimSuffix(conf.Conf.Cdn, "/"), "$version", conf.WebVersion),
}
// try to get old config
if siteConfig.ApiURL == "" {
siteConfig.ApiURL = setting.GetStr(conf.ApiUrl)
siteConfig.BasePath = setting.GetStr(conf.BasePath)
}
if siteConfig.BasePath != "" {
siteConfig.BasePath = utils.FixAndCleanPath(siteConfig.BasePath)
}