Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sz/sz_his_api_controller.go

@@ -9,6 +9,7 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
+	"github.com/axgle/mahonia"
 	"math/rand"
 
 	//"github.com/axgle/mahonia"
@@ -3820,11 +3821,11 @@ const (
 	GB18030 = Charset("GB18030")
 )
 
-//func ConvertToString(src string, srcCode string, tagCode string) string {
-//	srcCoder := mahonia.NewDecoder(srcCode)
-//	srcResult := srcCoder.ConvertString(src)
-//	tagCoder := mahonia.NewDecoder(tagCode)
-//	_, cdata, _ := tagCoder.Translate([]byte(srcResult), true)
-//	result := string(cdata)
-//	return result
-//}
+func ConvertToString(src string, srcCode string, tagCode string) string {
+	srcCoder := mahonia.NewDecoder(srcCode)
+	srcResult := srcCoder.ConvertString(src)
+	tagCoder := mahonia.NewDecoder(tagCode)
+	_, cdata, _ := tagCoder.Translate([]byte(srcResult), true)
+	result := string(cdata)
+	return result
+}