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

controllers/js/jsyb_controller.go

@@ -482,7 +482,7 @@ func (c *JSybController) ReadCard() {
 }
 
 func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak string) {
-	DllDef := syscall.MustLoadDLL("SSCardDriver.dll")
+	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	Iinit := DllDef.MustFindProc("Init")
 	//miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	str := make([]byte, 1024)

controllers/sg/his_api_controller.go

@@ -340,6 +340,9 @@ func (c *HisApiController) ReadCard() {
 			}
 
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
+			DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
+			Iinit := DllDef.MustFindProc("Init")
+			fmt.Println(Iinit)
 			var res ResultTwo
 			api := "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber
 

main.go

@@ -15,11 +15,11 @@ 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)
 
 }
 func main() {