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

controllers/js/jsyb_controller.go

@@ -826,7 +826,7 @@ func (c *JSybController) GetBasBaseInfo() (string, string) {
 
 func (c *JSybController) GetELeInfo(code string, operator_id string, operator_name string) (string, string) {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
-	readCard := DllDef.MustFindProc("EcQuery")
+	readCard := DllDef.MustFindProc("EcCardQuery")
 	fmt.Println(readCard)
 	fmt.Println("!!!!!")
 	//pCardInfo := make([]byte, 8192)
@@ -848,7 +848,7 @@ func (c *JSybController) GetELeInfo(code string, operator_id string, operator_na
 	data["orgId"] = code
 	bytesData, _ := json.Marshal(data)
 	//pCardInfo = bytesData
-	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&bytesData[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
 	fmt.Println(ret2)
 	fmt.Println(DeleteExtraSpace(string(bytesData)))
 	fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))

main.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
-
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -16,12 +14,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)
 }