From 0039dc18e1239b3eb2ffb91b9dbbc66050c51097 Mon Sep 17 00:00:00 2001 From: Noah Hsu Date: Thu, 22 Sep 2022 17:11:45 +0800 Subject: [PATCH] fix: set cdn to basePath if cdn is empty --- server/static/static.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/static/static.go b/server/static/static.go index 1b047952..6d193d91 100644 --- a/server/static/static.go +++ b/server/static/static.go @@ -10,6 +10,7 @@ import ( "github.com/alist-org/alist/v3/cmd/flags" "github.com/alist-org/alist/v3/internal/conf" "github.com/alist-org/alist/v3/internal/setting" + "github.com/alist-org/alist/v3/pkg/utils" "github.com/alist-org/alist/v3/public" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" @@ -28,6 +29,12 @@ func UpdateIndex() { cdn := strings.TrimSuffix(conf.Conf.Cdn, "/") cdn = strings.ReplaceAll(cdn, "$version", conf.WebVersion) basePath := setting.GetStr(conf.BasePath) + if basePath != "" { + basePath = utils.StandardizePath(basePath) + } + if cdn == "" { + cdn = basePath + } apiUrl := setting.GetStr(conf.ApiUrl) favicon := setting.GetStr(conf.Favicon) title := setting.GetStr(conf.SiteTitle)