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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10138
+org_id = 10188
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -54,7 +54,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
 #gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+# gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
 #韶关

controllers/js/jsyb_controller.go

@@ -722,11 +722,11 @@ func (c *JSybController) ReadCard() {
 		}
 		break
 	case "3": //电子凭证
-		pCardInfo, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
-		fmt.Println(pCardInfo)
+		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
+		//fmt.Println(pCardInfo)
 		fmt.Println(pBusiCardInfo)
 		pBusiCardInfo = Remove0000(pBusiCardInfo)
-		pCardInfo = Remove0000(pCardInfo)
+		//pCardInfo = Remove0000(pCardInfo)
 		var ele ELeData
 		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
 		if err != nil {
@@ -742,8 +742,8 @@ func (c *JSybController) ReadCard() {
 				fmt.Println(err)
 			}
 			c.ServeSuccessJSON(map[string]interface{}{
-				"status":         "0",
-				"card_info":      pCardInfo,
+				"status": "0",
+				//"card_info":      pCardInfo,
 				"busi_card_info": pBusiCardInfo,
 				"token":          token,
 				"result":         dat,
@@ -766,9 +766,7 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	Iinit := DllDef.MustFindProc("Init")
 	//miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	str := make([]byte, 2048)
-
 	inputData := make(map[string]interface{})
-
 	inputData["IP"] = "10.72.3.87"
 	inputData["PORT"] = "8086"
 	inputData["TIMEOUT"] = "180"
@@ -829,32 +827,32 @@ func (c *JSybController) GetELeInfo(code string, operator_id string, operator_na
 	//pCardInfo := make([]byte, 8192)
 	pBusiCardInfo := make([]byte, 8192)
 
-	data := make(map[string]interface{})
+	//data := make(map[string]interface{})
 	//pData := make(map[string]interface{})
 
-	inputData := make(map[string]interface{})
-	inputData["orgId"] = code
-	inputData["businessType"] = "01101"
-	inputData["operatorId"] = operator_id
-	inputData["operatorName"] = operator_name
-	inputData["officeId"] = "001"
-	inputData["officeName"] = "血透室"
-
-	data["data"] = inputData
-	data["transType"] = "ec.query"
-	data["orgId"] = code
-	bytesData, _ := json.Marshal(data)
+	//inputData := make(map[string]interface{})
+	//inputData["orgId"] = code
+	//inputData["businessType"] = "01101"
+	//inputData["operatorId"] = operator_id
+	//inputData["operatorName"] = operator_name
+	//inputData["officeId"] = "001"
+	//inputData["officeName"] = "血透室"
+
+	//data["data"] = inputData
+	//data["transType"] = "ec.query"
+	//data["orgId"] = code
+	//bytesData, _ := json.Marshal(data)
 	//pCardInfo = bytesData
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
 	fmt.Println(ret2)
-	fmt.Println(DeleteExtraSpace(string(bytesData)))
+	//fmt.Println(DeleteExtraSpace(string(bytesData)))
 	fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))
-	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	//fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
 	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
 	if ret2 != 0 {
 		return "", ""
 	}
-	return DeleteExtraSpace(string(bytesData)), DeleteExtraSpace(string(pBusiCardInfo))
+	return DeleteExtraSpace(""), DeleteExtraSpace(string(pBusiCardInfo))
 }
 
 func IntPtr(n int) uintptr {

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
+	//"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -15,12 +15,12 @@ import (
 )
 
 func init() {
-	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	CreateLog(miConfig)
-	UploadLog(miConfig)
+	//service.ConnectDB()
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }