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

controllers/js/jsyb_controller.go

@@ -831,7 +831,10 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	inputData["TIMEOUT"] = "180"
 	inputData["LOG_PATH"] = "C:\\log\\"
 	//
-	inputData["EC_URL"] = "http://10.72.3.127:10086/localcfc/api/hsecfc/localQrCodeQuery"
+
+	inputData["EC_URL"] = "http://10.58.33.207:10086/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"
@@ -916,14 +919,11 @@ func (c *JSybController) GetELeInfo(code string, operator_id string, operator_na
 
 func (c *JSybController) GetELeCertInfo(code string, operator_id string, operator_name string) (string, string) {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
-	readCard := DllDef.MustFindProc("EcQuery")
-	fmt.Println(readCard)
-	fmt.Println("!!!!!")
+	readCard := DllDef.MustFindProc("GetPersonInfo")
+
 	pCardInfo := make([]byte, 8192)
 	pBusiCardInfo := make([]byte, 8192)
-
 	data := make(map[string]interface{})
-	//pData := make(map[string]interface{})
 
 	inputData := make(map[string]interface{})
 	inputData["orgId"] = code
@@ -931,8 +931,7 @@ func (c *JSybController) GetELeCertInfo(code string, operator_id string, operato
 	inputData["operatorId"] = "1"
 	inputData["operatorName"] = "admin"
 	inputData["officeId"] = "001"
-	inputData["officeName"] = "血透室"
-	//
+	inputData["officeName"] = "admin"
 	data["data"] = inputData
 	data["transType"] = "ec.query"
 	data["orgId"] = code