diff --git a/encoding/gjson/gjson_api.go b/encoding/gjson/gjson_api.go index 13b455bcc..7321b7738 100644 --- a/encoding/gjson/gjson_api.go +++ b/encoding/gjson/gjson_api.go @@ -274,24 +274,6 @@ func (j *Json) Append(pattern string, value interface{}) error { return fmt.Errorf("invalid variable type of %s", pattern) } -// GetToVar gets the value by specified , -// and converts it to specified golang variable . -// The should be a pointer type. -// Deprecated. -func (j *Json) GetToVar(pattern string, pointer interface{}) error { - r := j.Get(pattern) - if r != nil { - if t, err := Encode(r); err == nil { - return DecodeTo(t, pointer) - } else { - return err - } - } else { - pointer = nil - } - return nil -} - // GetStruct gets the value by specified , // and converts it to specified object . // The should be the pointer to an object. @@ -330,12 +312,6 @@ func (j *Json) GetMapStructsDeep(pattern string, pointer interface{}, mapping .. return gconv.MapStructsDeep(j.Get(pattern), pointer, mapping...) } -// GetToStruct is alias of GetStruct. -// Deprecated. -func (j *Json) GetToStruct(pattern string, pointer interface{}, mapping ...map[string]string) error { - return j.GetStruct(pattern, pointer, mapping...) -} - // ToMap converts current Json object to map[string]interface{}. // It returns nil if fails. func (j *Json) ToMap() map[string]interface{} { diff --git a/errors/gerror/gerror.go b/errors/gerror/gerror.go index 844b61cac..c9df839ec 100644 --- a/errors/gerror/gerror.go +++ b/errors/gerror/gerror.go @@ -30,6 +30,17 @@ func New(text string) error { } } +// Newf returns an error that formats as the given text. +func Newf(format string, args ...interface{}) error { + if format == "" { + return nil + } + return &Error{ + stack: callers(), + text: fmt.Sprintf(format, args...), + } +} + // Wrap wraps error with text. // It returns nil if given err is nil. func Wrap(err error, text string) error { diff --git a/i18n/gi18n/gi18n_manager.go b/i18n/gi18n/gi18n_manager.go index fbf4b3a01..f512c97c7 100644 --- a/i18n/gi18n/gi18n_manager.go +++ b/i18n/gi18n/gi18n_manager.go @@ -12,6 +12,8 @@ import ( "strings" "sync" + "github.com/gogf/gf/os/glog" + "github.com/gogf/gf/os/gfsnotify" "github.com/gogf/gf/text/gregex" @@ -164,11 +166,12 @@ func (m *Manager) init() { if m.data[lang] == nil { m.data[lang] = make(map[string]string) } - j, _ := gjson.LoadContent(file.Content()) - if j != nil { + if j, err := gjson.LoadContent(file.Content()); err == nil { for k, v := range j.ToMap() { m.data[lang][k] = gconv.String(v) } + } else { + glog.Errorf("load i18n file '%s' failed: %v", file, err) } } } @@ -190,11 +193,12 @@ func (m *Manager) init() { if m.data[lang] == nil { m.data[lang] = make(map[string]string) } - j, _ := gjson.LoadContent(gfile.GetBytes(file)) - if j != nil { + if j, err := gjson.LoadContent(gfile.GetBytes(file)); err == nil { for k, v := range j.ToMap() { m.data[lang][k] = gconv.String(v) } + } else { + glog.Errorf("load i18n file '%s' failed: %v", file, err) } } _, _ = gfsnotify.Add(path, func(event *gfsnotify.Event) {