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

controllers/js/jsyb_controller.go

@@ -12,6 +12,7 @@ import (
 	"github.com/axgle/mahonia"
 	"io/ioutil"
 	"regexp"
+	"strconv"
 	"strings"
 	"syscall"
 	"unsafe"
@@ -198,11 +199,18 @@ func (c *JSybController) PostFour() {
 
 	} else {
 
+	}
+
+	var dat3 int64
+	if err := json.Unmarshal([]byte(strconv.FormatInt(timeStamp, 10)), &dat3); err == nil {
+
+	} else {
+
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre":         dat,
 		"request_log": dat2,
-		"time_stamp":  timeStamp,
+		"time_stamp":  dat3,
 	})
 }
 

controllers/sg/his_api_controller.go

@@ -5357,7 +5357,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		fmt.Println("-------")
 		fmt.Println(respJSON["data"])
 		fmt.Println(respJSON["data"].(map[string]interface{})["time_stamp"])
-		fmt.Println(respJSON["data"].(map[string]interface{})["time_stamp"].(float64))
+		//fmt.Println(respJSON["data"].(map[string]interface{})["time_stamp"].(float64))
 		fmt.Println("-------")
 
 		//time_stamp = int64(respJSON["data"].(map[string]interface{})["time_stamp"].(float64))

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