|
@@ -2,11 +2,11 @@ package controllers
|
|
|
|
|
|
import (
|
|
|
"encoding/json"
|
|
|
+ "eta/eta_pub/models"
|
|
|
+ "eta/eta_pub/services"
|
|
|
+ "eta/eta_pub/services/ppt2img"
|
|
|
+ "eta/eta_pub/utils"
|
|
|
"fmt"
|
|
|
- "hongze/hongze_public_api/models"
|
|
|
- "hongze/hongze_public_api/services"
|
|
|
- "hongze/hongze_public_api/services/ppt2img"
|
|
|
- "hongze/hongze_public_api/utils"
|
|
|
"io/ioutil"
|
|
|
"os"
|
|
|
"os/exec"
|
|
@@ -161,7 +161,7 @@ func (this *ImageController) Base64Upload() {
|
|
|
}
|
|
|
outFileName = uploadDir + randStr + ".png"
|
|
|
fmt.Println("start convert", time.Now())
|
|
|
- cd := exec.Command("highcharts-export-server", "--infile", saveSvgPath, "--constr", "Chart", "--scale", "2","--workers","10","--workLimit","5", "--outfile", outFileName)
|
|
|
+ cd := exec.Command("highcharts-export-server", "--infile", saveSvgPath, "--constr", "Chart", "--scale", "2", "--workers", "10", "--workLimit", "5", "--outfile", outFileName)
|
|
|
str, err := cd.Output()
|
|
|
fmt.Println(string(str))
|
|
|
if err != nil {
|
|
@@ -221,10 +221,10 @@ func (this *ImageController) Ppt2Image() {
|
|
|
}
|
|
|
|
|
|
// 下载ppt
|
|
|
- pptPath,err := utils.DownloadImage(req.PptUrl)
|
|
|
- if err != nil{
|
|
|
+ pptPath, err := utils.DownloadImage(req.PptUrl)
|
|
|
+ if err != nil {
|
|
|
br.Msg = "下载ppt失败"
|
|
|
- br.ErrMsg = "下载ppt失败,Err:"+err.Error()
|
|
|
+ br.ErrMsg = "下载ppt失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
defer func() {
|
|
@@ -234,9 +234,9 @@ func (this *ImageController) Ppt2Image() {
|
|
|
// ppt转pdf
|
|
|
converterType := "pdf"
|
|
|
pdfPath, err := ppt2img.FuncDocs2Pdf(utils.LibreOfficePath, pptPath, "./static/pdf", converterType)
|
|
|
- if err != nil{
|
|
|
+ if err != nil {
|
|
|
br.Msg = "ppt转pdf失败"
|
|
|
- br.ErrMsg = "ppt转pdf失败,Err:"+err.Error()
|
|
|
+ br.ErrMsg = "ppt转pdf失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
defer func() {
|
|
@@ -245,13 +245,13 @@ func (this *ImageController) Ppt2Image() {
|
|
|
}()
|
|
|
|
|
|
// 生成临时存放图片的目录
|
|
|
- uploadDir := "./static/pdf/png/"+utils.GetRandStringNoSpecialChar(16)+"/"
|
|
|
+ uploadDir := "./static/pdf/png/" + utils.GetRandStringNoSpecialChar(16) + "/"
|
|
|
{
|
|
|
if !utils.FileIsExist(uploadDir) {
|
|
|
err := os.MkdirAll(uploadDir, 0777)
|
|
|
if err != nil {
|
|
|
br.Msg = "创建存放图片的目录失败"
|
|
|
- br.ErrMsg = "创建存放图片的目录失败,Err:"+err.Error()
|
|
|
+ br.ErrMsg = "创建存放图片的目录失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
}
|
|
@@ -261,43 +261,42 @@ func (this *ImageController) Ppt2Image() {
|
|
|
os.RemoveAll(uploadDir)
|
|
|
}()
|
|
|
|
|
|
- pdfPathList := strings.Split(pdfPath,"/")
|
|
|
- pngName := strings.Split(path.Base(pdfPathList[len(pdfPathList)-1]), ".")[0] //图片名称
|
|
|
- convPngName := uploadDir + pngName+".png"
|
|
|
+ pdfPathList := strings.Split(pdfPath, "/")
|
|
|
+ pngName := strings.Split(path.Base(pdfPathList[len(pdfPathList)-1]), ".")[0] //图片名称
|
|
|
+ convPngName := uploadDir + pngName + ".png"
|
|
|
|
|
|
// pdf 转图片
|
|
|
- _,err = ppt2img.Pdf2Img(pdfPath,convPngName)
|
|
|
- if err != nil{
|
|
|
+ _, err = ppt2img.Pdf2Img(pdfPath, convPngName)
|
|
|
+ if err != nil {
|
|
|
br.Msg = "pdf转png失败"
|
|
|
- br.ErrMsg = "pdf转png失败,Err:"+err.Error()
|
|
|
+ br.ErrMsg = "pdf转png失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
|
|
|
// oss的图片存放地址
|
|
|
- resourceUrlList := make([]string,0)
|
|
|
-
|
|
|
+ resourceUrlList := make([]string, 0)
|
|
|
|
|
|
// 获取生成的文件列表
|
|
|
- fileInfoList,err := ioutil.ReadDir(uploadDir)
|
|
|
+ fileInfoList, err := ioutil.ReadDir(uploadDir)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取生成的文件列表失败"
|
|
|
- br.ErrMsg = "获取生成的文件列表失败,Err:"+err.Error()
|
|
|
+ br.ErrMsg = "获取生成的文件列表失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
countFile := len(fileInfoList)
|
|
|
- for i:=0;i<countFile;i++{
|
|
|
- tmpFilePath := fmt.Sprintf("%s%s-%d.png",uploadDir,pngName,i)
|
|
|
- if utils.FileIsExist(tmpFilePath){
|
|
|
- resourceUrl,tmpErr := uploadToAliOss(tmpFilePath)
|
|
|
- if tmpErr != nil{
|
|
|
+ for i := 0; i < countFile; i++ {
|
|
|
+ tmpFilePath := fmt.Sprintf("%s%s-%d.png", uploadDir, pngName, i)
|
|
|
+ if utils.FileIsExist(tmpFilePath) {
|
|
|
+ resourceUrl, tmpErr := uploadToAliOss(tmpFilePath)
|
|
|
+ if tmpErr != nil {
|
|
|
br.Msg = "上传图片至oss失败"
|
|
|
- br.ErrMsg = "上传图片至oss失败,Err:"+err.Error()
|
|
|
+ br.ErrMsg = "上传图片至oss失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- resourceUrlList = append(resourceUrlList,resourceUrl)
|
|
|
- }else{
|
|
|
+ resourceUrlList = append(resourceUrlList, resourceUrl)
|
|
|
+ } else {
|
|
|
br.Msg = "上传图片至oss失败"
|
|
|
- br.ErrMsg = "上传图片至oss失败,Err:"+err.Error()
|
|
|
+ br.ErrMsg = "上传图片至oss失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
}
|
|
@@ -309,7 +308,7 @@ func (this *ImageController) Ppt2Image() {
|
|
|
}
|
|
|
|
|
|
// 上传文件到阿里云
|
|
|
-func uploadToAliOss(outFileName string) (resourceUrl string,err error) {
|
|
|
+func uploadToAliOss(outFileName string) (resourceUrl string, err error) {
|
|
|
var saveToOssPath string
|
|
|
randStr := utils.GetRandStringNoSpecialChar(28)
|
|
|
uploadDir := "static/images/"
|