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

service/fj_service.go

@@ -5,6 +5,7 @@ import (
 	"gdyb/models"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
+	"golang.org/x/text/encoding/simplifiedchinese"
 	"io/ioutil"
 	"net/http"
 	"strconv"
@@ -2451,10 +2452,9 @@ func GetFjBusinessHandleInfo(inputStr []byte) (string, string) {
 	outputStr := make([]byte, 4096)
 	errMessageStr := make([]byte, 2048)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&inputStr[0])), uintptr(20000), (uintptr)(unsafe.Pointer(&outputStr[0])), (uintptr)(unsafe.Pointer(&errMessageStr[0])))
-	enc := mahonia.NewEncoder("gbk")
 
-	fmt.Println("错误信息1:", enc.ConvertString(string(errMessageStr)))
-	fmt.Println("输出信息1:", enc.ConvertString(string(outputStr)))
+	fmt.Println("错误信息1:", ConvertByte2String(errMessageStr, GB18030))
+	fmt.Println("输出信息1:", ConvertByte2String(outputStr, GB18030))
 
 	if ret2 != 0 {
 		return "", ""
@@ -2488,3 +2488,19 @@ func Remove0000(s string) string {
 	}
 	return string(str)
 }
+
+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
+}