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

service/fj_service.go

 	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])))
-	fmt.Println("输出信息1:", ConvertToString(Remove0000(string(outputStr)), "gbk", "utf-8"))
-	fmt.Println("错误信息1:", ConvertToString(Remove0000(string(errMessageStr)), "gbk", "utf-8"))
+	fmt.Println("输出信息1:", ConvertToString(string(outputStr), "utf-8", "gbk"))
+	fmt.Println("错误信息1:", ConvertToString(string(errMessageStr), "utf-8", "gbk"))
 	if ret2 != 0 {
 		return "", ""
 	}