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

controllers/sg/his_api_controller.go

@@ -5328,6 +5328,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["begin_time"] = begin_time
 		data["dept"] = strconv.FormatInt(department.ID, 10)
 		data["config"] = config
+		data["url"] = miConfig.Url
+		data["ak"] = miConfig.ChannelNumber
 
 		fmt.Println(data)