lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2025-06-12 16:10:39 +00:00
Code Issues Releases Activity

remove interfaceToStr function to package config

Browse Source
This commit is contained in:
ysqi
2016-02-04 20:15:37 +08:00
parent 1222c87be3
commit 36f69a04a9
3 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
config/xml/xml.go
View File

@ -190,28 +190,7 @@ func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []stri
// GetSection returns map for the given section
func (c *ConfigContainer) GetSection(section string) (map[string]string, error) {
if v, ok := c.data[section]; ok {
var interfaceToStr func(map[string]interface{}) map[string]string
interfaceToStr = func(values map[string]interface{}) map[string]string {
strValues := make(map[string]string, len(values))
for k, vv := range values {
if vv == nil {
strValues[k] = ""
} else if env, ok := config.Getenv(vv); ok {
strValues[k] = env
} else if str, ok := vv.(string); ok {
strValues[k] = str
} else if m, ok := vv.(map[string]interface{}); ok {
strValues[k] = fmt.Sprintf("%v", interfaceToStr(m))
} else {
// TODO: no better.
strValues[k] = fmt.Sprintf("%v", vv)
}
}
return strValues
}
return interfaceToStr(v.(map[string]interface{})), nil
return config.ConvertToStringMap(v.(map[string]interface{})), nil
}
return nil, errors.New("not exist setction")
}