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

controllers/sg/his_api_controller.go

@@ -5355,7 +5355,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 			return
 		}
 
-		time_stamp = respJSON["data"].(map[string]interface{})["time_stamp"].(int64)
+		time_stamp = int64(respJSON["data"].(map[string]interface{})["time_stamp"].(float64))
 
 		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		userJSONBytes, _ := json.Marshal(respJSON)

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