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"
 	"math/rand"
 	"strconv"
@@ -1711,16 +1712,13 @@ func ReadCardGetCode(request string) (string, string) {
 	str3 := make([]byte, 256)
 	ret4, _, _ := readCards.Call(StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
 	fmt.Println(":", string(str3))
-
-	fmt.Println(":", ConvertByte2String(str3, GB18030))
-
+	fmt.Println(":", ConvertToString(string(str3), "gbk", "utf-8"))
 	if ret4 == 0 {
 		result := string(str3)
 		fmt.Println(result)
 		result_arr := strings.Split(result, "|")
 		verifyCode := result_arr[0] + "|" + result_arr[1]
 		versionCode := result_arr[2]
-
 		return verifyCode, versionCode
 
 	}
@@ -2723,18 +2721,11 @@ const (
 	GB18030 = Charset("GB18030")
 )
 
-func ConvertByte2String(byte []byte, charset Charset) string {
-
-	var str string
-	switch charset {
-	case GB18030:
-		decodeBytes, _ := simplifiedchinese.GB18030.NewDecoder().Bytes(byte)
-		str = string(decodeBytes)
-	case UTF8:
-		fallthrough
-	default:
-		str = string(byte)
-	}
-
-	return str
+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
 }