Skip to content

B
beego
Commit d446b5b0 authored by astaxie's avatar astaxie
Browse files
Options

improve the defaultval

parent 2ba12ad1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
config.go
View file @ d446b5b0
...@@ -158,7 +158,7 @@ func (b *beegoAppConfig) DefaultString(key string, defaultval string) string { ...@@ -158,7 +158,7 @@ func (b *beegoAppConfig) DefaultString(key string, defaultval string) string {
if v != "" { if v != "" {
return v return v
} }
return b.innerConfig.DefaultString(key, defaultval) return defaultval
} }
func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []string { func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []string {
...@@ -166,7 +166,7 @@ func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []strin ...@@ -166,7 +166,7 @@ func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []strin
if len(v) != 0 { if len(v) != 0 {
return v return v
} }
return b.innerConfig.DefaultStrings(key, defaultval) return defaultval
} }
func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int {
...@@ -174,7 +174,7 @@ func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { ...@@ -174,7 +174,7 @@ func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int {
if err == nil { if err == nil {
return v return v
} }
return b.innerConfig.DefaultInt(key, defaultval) return defaultval
} }
func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 {
...@@ -182,7 +182,7 @@ func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { ...@@ -182,7 +182,7 @@ func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 {
if err == nil { if err == nil {
return v return v
} }
return b.innerConfig.DefaultInt64(key, defaultval) return defaultval
} }
func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool {
...@@ -190,7 +190,7 @@ func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { ...@@ -190,7 +190,7 @@ func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool {
if err == nil { if err == nil {
return v return v
} }
return b.innerConfig.DefaultBool(key, defaultval) return defaultval
} }
func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 {
...@@ -198,7 +198,7 @@ func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { ...@@ -198,7 +198,7 @@ func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 {
if err == nil { if err == nil {
return v return v
} }
return b.innerConfig.DefaultFloat(key, defaultval) return defaultval
} }
func (b *beegoAppConfig) DIY(key string) (interface{}, error) { func (b *beegoAppConfig) DIY(key string) (interface{}, error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment