bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 16:21:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve configuraion style for gdb

Browse Source
This commit is contained in:
john
2019-07-09 15:08:26 +08:00
parent 145fccdf6e
commit b43e36a79d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
g/frame/gins/gins.go
View File

@ -93,12 +93,12 @@ func Database(name ...string) gdb.DB {
switch value := groupConfig.(type) {
case []interface{}:
for _, v := range value {
if node := parseConfigNode(v); node != nil {
if node := parseDBConfigNode(v); node != nil {
cg = append(cg, *node)
}
}
case map[string]interface{}:
if node := parseConfigNode(value); node != nil {
if node := parseDBConfigNode(value); node != nil {
cg = append(cg, *node)
}
}
@ -107,7 +107,7 @@ func Database(name ...string) gdb.DB {
}
}
// Parse <m> as a single node configuration.
if node := parseConfigNode(m); node != nil {
if node := parseDBConfigNode(m); node != nil {
cg := gdb.ConfigGroup{}
if node.LinkInfo != "" || node.Host != "" {
cg = append(cg, *node)
@ -132,7 +132,7 @@ func Database(name ...string) gdb.DB {
}
// 解析数据库配置节点项
func parseConfigNode(value interface{}) *gdb.ConfigNode {
func parseDBConfigNode(value interface{}) *gdb.ConfigNode {
nodeMap, ok := value.(map[string]interface{})
if !ok {
return nil