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

controllers/js/jsyb_controller.go

@@ -555,11 +555,10 @@ func (c *JSybController) GetBasBaseInfo() (string, string) {
 	pBusiCardInfo := make([]byte, 8192)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
 	fmt.Println(ret2)
-	str = strings.Replace(str, " ", "", -1)
-	fmt.Println(string(strings.Replace(string(pCardInfo), " ", "", -1)))
-	fmt.Println(string(strings.Replace(string(str), " ", "", -1)))
-	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
-	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
+	fmt.Println(DeleteExtraSpace(string(pCardInfo)))
+	fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pCardInfo)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
 	if ret2 != 0 {
 		return "", ""
 	}