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

service/fj_service.go

@@ -2456,13 +2456,10 @@ func GetFjBusinessHandleInfo(inputStr []byte) (string, string) {
 	fmt.Println("错误信息1:", ConvertByte2String(errMessageStr, GB18030))
 	fmt.Println("输出信息1:", ConvertByte2String(outputStr, GB18030))
 
-	fmt.Println("错误信息1:", ConvertToString(string(errMessageStr), "gbk", "utf-8"))
-	fmt.Println("输出信息1:", ConvertToString(string(outputStr), "gbk", "utf-8"))
-
 	if ret2 != 0 {
 		return "", ""
 	}
-	return ConvertToString(Remove0000(string(outputStr)), "GB18030", "utf-8"), ConvertToString(Remove0000(string(errMessageStr)), "GB18030", "utf-8")
+	return ConvertByte2String([]byte(Remove0000(string(errMessageStr))), GB18030), ConvertByte2String([]byte(Remove0000(string(outputStr))), GB18030)
 }
 
 func GetFjAuthorizationInfo(org_id string) {