修改图片上传

controllers/image.go

@@ -134,9 +134,7 @@ func (this *ImageController) Base64Upload() {
 		return
 	}
 	var err error
-	dateDir := time.Now().Format("20060102")
-	uploadDir := "static/imgs/" + dateDir
-
+	uploadDir := "static/images/"
 	if !utils.FileIsExist(uploadDir) {
 		err = os.MkdirAll(uploadDir, 777)
 		if err != nil {
@@ -147,36 +145,34 @@ func (this *ImageController) Base64Upload() {
 	}
 	var saveToOssPath string
 	randStr := utils.GetRandStringNoSpecialChar(28)
-	var fileName, savePath, svgPath, outFileName string
+	var fileName, saveSvgPath, outFileName string
 	fileName = randStr + ".svg"
-	savePath = uploadDir + "/" + fileName
-	svgPath = savePath
-	err = utils.SaveToFile(imgData, savePath)
+	saveSvgPath = uploadDir + "/" + fileName
+	err = utils.SaveToFile(imgData, saveSvgPath)
 	if err != nil {
 		br.Msg = "图片保存失败"
 		br.ErrMsg = "图片保存失败,Err:" + err.Error()
 		return
 	}
-	hzUploadDir := "static/images/"
-	outFileName = hzUploadDir + randStr + ".png"
+	outFileName = uploadDir + randStr + ".png"
 	fmt.Println("start convert", time.Now())
-	cd := exec.Command("highcharts-export-server", "--infile", svgPath, "--constr", "Chart", "--scale", "2", "--outfile", outFileName)
+	cd := exec.Command("highcharts-export-server", "--infile", saveSvgPath, "--constr", "Chart", "--scale", "2", "--outfile", outFileName)
 	str, err := cd.Output()
 	fmt.Println(string(str))
 	if err != nil {
-		fmt.Println(err)
+		fmt.Println("Command Err:" + err.Error())
+		return
 	}
 	fmt.Println("end convert", time.Now())
-	savePath = outFileName
 	//defer func() {
 	//	os.Remove(svgPath)
 	//	os.Remove(outFileName)
 	//}()
-	saveToOssPath = hzUploadDir + time.Now().Format("200601/20060102/")
+	saveToOssPath = uploadDir + time.Now().Format("200601/20060102/")
 	saveToOssPath += outFileName
 	//上传到阿里云
-	fmt.Println("upload:", savePath, saveToOssPath)
-	err = services.UploadFileToAliyun("", savePath, saveToOssPath)
+	fmt.Println("upload:", outFileName, saveToOssPath)
+	err = services.UploadFileToAliyun("", outFileName, saveToOssPath)
 	if err != nil {
 		br.Msg = "文件上传失败"
 		br.ErrMsg = "文件上传失败，Err:" + err.Error()