From 33ef34b95d90f4d9953ba410bf768eb1af8c3f8e Mon Sep 17 00:00:00 2001 From: Maxgis Date: Sun, 24 Jul 2016 15:29:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=B2=A1=E6=9C=89=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81=E4=BB=A5=E5=8F=8A=E9=9D=99?= =?UTF-8?q?=E6=80=81=E5=89=8D=E7=BC=80=E5=89=8D=E9=9D=A2=E6=9C=89/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.go | 5 ++--- staticfile.go | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config.go b/config.go index 2761e7cb..067f0d1b 100644 --- a/config.go +++ b/config.go @@ -256,13 +256,12 @@ func parseConfig(appConfigPath string) (err error) { sds := strings.Fields(sd) for _, v := range sds { if url2fsmap := strings.SplitN(v, ":", 2); len(url2fsmap) == 2 { - BConfig.WebConfig.StaticDir["/"+strings.TrimRight(url2fsmap[0], "/")] = url2fsmap[1] + BConfig.WebConfig.StaticDir["/"+strings.Trim(url2fsmap[0], "/")] = url2fsmap[1] } else { - BConfig.WebConfig.StaticDir["/"+strings.TrimRight(url2fsmap[0], "/")] = url2fsmap[0] + BConfig.WebConfig.StaticDir["/"+strings.Trim(url2fsmap[0], "/")] = url2fsmap[0] } } } - if sgz := AppConfig.String("StaticExtensionsToGzip"); sgz != "" { extensions := strings.Split(sgz, ",") fileExts := []string{} diff --git a/staticfile.go b/staticfile.go index 0aad2c81..4b19f949 100644 --- a/staticfile.go +++ b/staticfile.go @@ -157,13 +157,10 @@ func searchFile(ctx *context.Context) (string, os.FileInfo, error) { return filePath, fi, nil } } - return "", nil, errors.New(requestPath + " file not find") + return "", nil, errNotStaticRequest } for prefix, staticDir := range BConfig.WebConfig.StaticDir { - if len(prefix) == 0 { - continue - } if !strings.Contains(requestPath, prefix) { continue }