del merge
This commit is contained in:
parent
d2731144ae
commit
b854d2862f
|
@ -48,23 +48,3 @@ func NewFroms(tplConfig, saveConfig string) ([]*Form, error) {
|
|||
}
|
||||
return forms, err
|
||||
}
|
||||
|
||||
func MergeConfig(oldConfig, newConfig string) (string, error) {
|
||||
var oldCfg map[string]interface{}
|
||||
var newCfg map[string]interface{}
|
||||
json.Unmarshal([]byte(oldConfig), &oldCfg)
|
||||
json.Unmarshal([]byte(newConfig), &newCfg)
|
||||
if oldCfg == nil {
|
||||
oldCfg = make(map[string]interface{})
|
||||
}
|
||||
if newCfg == nil {
|
||||
newCfg = make(map[string]interface{})
|
||||
}
|
||||
|
||||
for k, v := range newCfg {
|
||||
oldCfg[k] = v
|
||||
}
|
||||
|
||||
res, _ := json.Marshal(oldCfg)
|
||||
return string(res), nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue