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

controllers/js/jsyb_controller.go

@@ -762,7 +762,8 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	inputData["PORT"] = "8086"
 	inputData["TIMEOUT"] = "180"
 	inputData["LOG_PATH"] = "C:\\log\\"
-	inputData["EC_URL"] = "http://10.72.42.210:10081/localcfc/api/hsecfc/localQrCodeQuery"
+	//
+	inputData["EC_URL"] = "http://10.72.3.127:10086/localcfc/api/hsecfc/localQrCodeQuery"
 	inputData["CARD_PASSTYPE"] = "1"
 	inputData["API_NAME"] = "hssServives"
 	inputData["API_VERSION"] = "1.0.0"
@@ -814,7 +815,7 @@ func (c *JSybController) GetELeInfo(code string, operator_id string, operator_na
 	readCard := DllDef.MustFindProc("EcQuery")
 	fmt.Println(readCard)
 	fmt.Println("!!!!!")
-	pCardInfo := make([]byte, 8192)
+	//pCardInfo := make([]byte, 8192)
 	pBusiCardInfo := make([]byte, 8192)
 
 	data := make(map[string]interface{})
@@ -832,8 +833,8 @@ func (c *JSybController) GetELeInfo(code string, operator_id string, operator_na
 	data["transType"] = "ec.query"
 	data["orgId"] = code
 	bytesData, _ := json.Marshal(data)
-	pCardInfo = bytesData
-	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	//pCardInfo = bytesData
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&bytesData[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
 	fmt.Println(ret2)
 	fmt.Println(DeleteExtraSpace(string(bytesData)))
 	fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))