lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2025-07-01 05:00:18 +00:00
Code Issues Releases Activity

Merge branch 'astaxie/develop' into environmentVar

Browse Source 
# Conflicts:
#	config/fake.go
#	config/xml/xml_test.go
#	config/yaml/yaml_test.go
This commit is contained in:
ysqi
2016-03-10 19:57:16 +08:00
parent 36f69a04a9 f45b271b96
commit 86c7f1db9e
52 changed files with 1205 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/fake.go
View File

@ -54,12 +54,16 @@ func (c *fakeConfigContainer) DefaultString(key string, defaultval string) strin
}
func (c *fakeConfigContainer) Strings(key string) []string {
return strings.Split(c.String(key), ";")
v := c.String(key)
if v == "" {
return nil
}
return strings.Split(v, ";")
}
func (c *fakeConfigContainer) DefaultStrings(key string, defaultval []string) []string {
v := c.Strings(key)
if len(v) == 0 {
if v == nil {
return defaultval
}
return v