|
@@ -6,17 +6,18 @@ import (
|
|
|
"eta_gn/eta_api/models"
|
|
|
"eta_gn/eta_api/utils"
|
|
|
"fmt"
|
|
|
- "github.com/pdfcpu/pdfcpu/pkg/api"
|
|
|
- "github.com/pdfcpu/pdfcpu/pkg/font"
|
|
|
- "github.com/pdfcpu/pdfcpu/pkg/pdfcpu"
|
|
|
- "github.com/pdfcpu/pdfcpu/pkg/pdfcpu/model"
|
|
|
- "github.com/pdfcpu/pdfcpu/pkg/pdfcpu/types"
|
|
|
"io"
|
|
|
"mime/multipart"
|
|
|
"os"
|
|
|
"os/exec"
|
|
|
"strings"
|
|
|
"time"
|
|
|
+
|
|
|
+ "github.com/pdfcpu/pdfcpu/pkg/api"
|
|
|
+ "github.com/pdfcpu/pdfcpu/pkg/font"
|
|
|
+ "github.com/pdfcpu/pdfcpu/pkg/pdfcpu"
|
|
|
+ "github.com/pdfcpu/pdfcpu/pkg/pdfcpu/model"
|
|
|
+ "github.com/pdfcpu/pdfcpu/pkg/pdfcpu/types"
|
|
|
)
|
|
|
|
|
|
// UploadToOssAndFileName 上传到oss并使用这个名称
|
|
@@ -121,9 +122,9 @@ func GetResourceUrlBySvgImg(imgData string) (resourceUrl string, err error, errM
|
|
|
|
|
|
// 删除临时存储的svg文件
|
|
|
defer func() {
|
|
|
- err = os.Remove(fileName)
|
|
|
- if err != nil {
|
|
|
- utils.FileLog.Info("删除临时存储的svg文件失败, err: " + err.Error())
|
|
|
+ tmpErr := os.Remove(fileName)
|
|
|
+ if tmpErr != nil {
|
|
|
+ utils.FileLog.Info("删除临时存储的svg文件失败, err: " + tmpErr.Error())
|
|
|
}
|
|
|
}()
|
|
|
outFileName = randStr + ".png"
|
|
@@ -143,9 +144,9 @@ func GetResourceUrlBySvgImg(imgData string) (resourceUrl string, err error, errM
|
|
|
doneChannel <- true
|
|
|
}()
|
|
|
defer func() {
|
|
|
- _ = os.Remove(outFileName)
|
|
|
- if err != nil {
|
|
|
- utils.FileLog.Info("删除生产的图片文件失败, err: " + err.Error())
|
|
|
+ tmpErr := os.Remove(outFileName)
|
|
|
+ if tmpErr != nil {
|
|
|
+ utils.FileLog.Info("删除生产的图片文件失败, err: " + tmpErr.Error())
|
|
|
}
|
|
|
}()
|
|
|
|