From 27733ce7ff0f6a2d79d0726c96c1387b480f8399 Mon Sep 17 00:00:00 2001 From: wenzi1 Date: Wed, 4 Jul 2018 11:17:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93xml=E4=B8=AD?= =?UTF-8?q?=E4=B8=8D=E5=8C=85=E5=90=ABencoding=E6=97=B6=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- g/encoding/gxml/gxml.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/g/encoding/gxml/gxml.go b/g/encoding/gxml/gxml.go index f52113860..c262eef77 100644 --- a/g/encoding/gxml/gxml.go +++ b/g/encoding/gxml/gxml.go @@ -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") {