lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2025-07-06 03:50: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

4
config/json.go
View File

@ -173,7 +173,7 @@ func (c *JSONConfigContainer) DefaultString(key string, defaultval string) strin
func (c *JSONConfigContainer) Strings(key string) []string {
stringVal := c.String(key)
if stringVal == "" {
return []string{}
return nil
}
return strings.Split(c.String(key), ";")
}
@ -181,7 +181,7 @@ func (c *JSONConfigContainer) Strings(key string) []string {
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
func (c *JSONConfigContainer) DefaultStrings(key string, defaultval []string) []string {
if v := c.Strings(key); len(v) > 0 {
if v := c.Strings(key); v != nil {
return v
}
return defaultval