feat(映射结构): 支持自定义映射结构体的tag键名

This commit is contained in:
xiaoqidun 2020-12-07 16:43:09 +08:00
parent b8fd6932d7
commit 09ce6a39f0

@ -12,6 +12,7 @@ import (
// GoINI GoINI数据结构 // GoINI GoINI数据结构
type GoINI struct { type GoINI struct {
tag string
data []byte data []byte
dataMap map[string]map[string]string dataMap map[string]map[string]string
nameList []string nameList []string
@ -22,6 +23,7 @@ type GoINI struct {
// NewGoINI 获取GoINI对象 // NewGoINI 获取GoINI对象
func NewGoINI() *GoINI { func NewGoINI() *GoINI {
return &GoINI{ return &GoINI{
tag: "goini",
commonField: "BuiltCommon", commonField: "BuiltCommon",
} }
} }
@ -120,6 +122,11 @@ func (ini *GoINI) String() string {
return strings.Join(iniLines, "\n") return strings.Join(iniLines, "\n")
} }
// SetTag 设置结构体的tag键名称
func (ini *GoINI) SetTag(tag string) {
ini.tag = tag
}
// SetData 从代码读取配置并解析 // SetData 从代码读取配置并解析
func (ini *GoINI) SetData(fileData []byte) { func (ini *GoINI) SetData(fileData []byte) {
ini.data = bytes.TrimSpace(fileData) ini.data = bytes.TrimSpace(fileData)
@ -232,7 +239,7 @@ func (ini *GoINI) MapToStruct(ptr interface{}) (err error) {
if !v.CanInterface() { if !v.CanInterface() {
continue continue
} }
k := t.Field(i).Tag.Get("goini") k := t.Field(i).Tag.Get(ini.tag)
if k == "" { if k == "" {
k = t.Field(i).Name k = t.Field(i).Name
} }
@ -244,7 +251,7 @@ func (ini *GoINI) MapToStruct(ptr interface{}) (err error) {
if !v.CanInterface() { if !v.CanInterface() {
continue continue
} }
kk := tt.Field(ii).Tag.Get("goini") kk := tt.Field(ii).Tag.Get(ini.tag)
if kk == "" { if kk == "" {
kk = t.Field(ii).Name kk = t.Field(ii).Name
} }