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 }