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

controllers/js/jsyb_controller.go

@@ -521,18 +521,17 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 func (c *JSybController) GetBasBaseInfo() string {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	readCard := DllDef.MustFindProc("ReadCardBas")
-	if readCard == nil {
-		fmt.Println("readcard is nil")
-		readCard = DllDef.MustFindProc("ReadCardBas")
-	}
+	fmt.Println(readCard)
+	readCard = DllDef.MustFindProc("ReadCardBas")
 	fmt.Println("!!!!!")
 	str := make([]byte, 2048)
 	str1 := make([]byte, 8192)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), (uintptr)(unsafe.Pointer(&str1[0])))
+	fmt.Println(ret2)
 	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 ""
 	}