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

controllers/sg/his_api_controller.go

@@ -11,6 +11,7 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
+	"github.com/axgle/mahonia"
 	"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"io"
@@ -444,19 +445,17 @@ func (c *HisApiController) GetBasBaseInfo() string {
 		fmt.Println("readcard is nil")
 		readCard = DllDef.MustFindProc("ReadCardBas")
 	}
-
 	str := make([]byte, 1024)
 	str1 := make([]byte, 1024)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
-
 	fmt.Println(string(str1))
 	fmt.Println(string(str))
-
+	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
 	if ret2 != 0 {
 		return ""
 	}
 	return string(str)
-
 }
 
 func prttostr(vcode uintptr) string {
@@ -6799,3 +6798,19 @@ func saveLog(result string, request string, infno string, desc string) {
 	}
 
 }
+
+type Charset string
+
+const (
+	UTF8    = Charset("UTF-8")
+	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
+}