Bladeren bron

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

csx 3 jaren geleden
bovenliggende
commit
a4891290e8
3 gewijzigde bestanden met toevoegingen van 9 en 6 verwijderingen
  1. 1 1
      controllers/js/jsyb_controller.go
  2. 3 0
      controllers/sg/his_api_controller.go
  3. 5 5
      main.go

+ 1 - 1
controllers/js/jsyb_controller.go Bestand weergeven

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

+ 3 - 0
controllers/sg/his_api_controller.go Bestand weergeven

340
 			}
340
 			}
341
 
341
 
342
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
342
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
343
+			DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
344
+			Iinit := DllDef.MustFindProc("Init")
345
+			fmt.Println(Iinit)
343
 			var res ResultTwo
346
 			var res ResultTwo
344
 			api := "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber
347
 			api := "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber
345
 
348
 

+ 5 - 5
main.go Bestand weergeven

15
 )
15
 )
16
 
16
 
17
 func init() {
17
 func init() {
18
-	//service.ConnectDB()
19
-	//org_id, _ := beego.AppConfig.Int64("org_id")
20
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
21
-	//CreateLog(miConfig)
22
-	//UploadLog(miConfig)
18
+	service.ConnectDB()
19
+	org_id, _ := beego.AppConfig.Int64("org_id")
20
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
21
+	CreateLog(miConfig)
22
+	UploadLog(miConfig)
23
 
23
 
24
 }
24
 }
25
 func main() {
25
 func main() {