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("HeaSecReadInfo.dll")
+	DllDef := syscall.MustLoadDLL("SSCardDriver.dll")
 	Iinit := DllDef.MustFindProc("Init")
 	//miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	str := make([]byte, 1024)

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() {