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

controllers/js/jsyb_controller.go

@@ -531,8 +531,8 @@ func (c *JSybController) GetBasBaseInfo() string {
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
 	fmt.Println(string(str1))
 	fmt.Println(string(str))
-	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
-	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
+	//fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
+	//fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
 	if ret2 != 0 {
 		return ""
 	}