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

修复当xml中不包含encoding时报错的问题

Browse Source
This commit is contained in:
wenzi1
2018-07-04 11:17:15 +08:00
parent 667bd0efa5
commit 27733ce7ff
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
g/encoding/gxml/gxml.go
View File

@ -61,10 +61,15 @@ func prepare(xmlbyte []byte) error {
if err != nil {
return err
}
xmlEncode := "UTF-8"
if len(matchStr) == 2 {
xmlEncode = matchStr[1]
}
charset := mahonia.GetCharset(matchStr[1])
charset := mahonia.GetCharset(xmlEncode)
if charset == nil {
return errors.New(fmt.Sprintf("not support charset:%s", matchStr[1]))
return errors.New(fmt.Sprintf("not support charset:%s", xmlEncode))
}
if !strings.EqualFold(charset.Name, "UTF-8") {