lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-23 00:20:55 +00:00
Code Issues Releases Activity

Merge pull request #2062 from Maxgis/feature_static

Browse Source 
减少没有必要的代码以及静态前缀前面有/
This commit is contained in:
astaxie 2016-07-25 22:19:38 +08:00 committed by GitHub
commit 02330c6085
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.go
View File

@ -233,9 +233,9 @@ func assignConfig(ac config.Configer) error {
sds := strings.Fields(sd) sds := strings.Fields(sd)
for _, v := range sds { for _, v := range sds {
if url2fsmap := strings.SplitN(v, ":", 2); len(url2fsmap) == 2 { 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 { } else {
BConfig.WebConfig.StaticDir["/"+strings.TrimRight(url2fsmap[0], "/")] = url2fsmap[0] BConfig.WebConfig.StaticDir["/"+strings.Trim(url2fsmap[0], "/")] = url2fsmap[0]
} }
} }
} }

5
staticfile.go
View File

@ -163,13 +163,10 @@ func searchFile(ctx *context.Context) (string, os.FileInfo, error) {
return filePath, fi, nil return filePath, fi, nil
} }
} }
return "", nil, errors.New(requestPath + " file not find") return "", nil, errNotStaticRequest
} }
for prefix, staticDir := range BConfig.WebConfig.StaticDir { for prefix, staticDir := range BConfig.WebConfig.StaticDir {
if len(prefix) == 0 {
continue
}
if !strings.Contains(requestPath, prefix) { if !strings.Contains(requestPath, prefix) {
continue continue
} }