|
@@ -7,7 +7,6 @@ import (
|
|
|
"app.yhyue.com/moapp/jy_docs/services/partner"
|
|
|
"app.yhyue.com/moapp/jyfs/rpc/filesystem"
|
|
|
"fmt"
|
|
|
- "log"
|
|
|
"os"
|
|
|
"os/exec"
|
|
|
"sync"
|
|
@@ -39,7 +38,7 @@ func NewConversion(docId, fileName, fileId, suffix string, b []byte, size int) *
|
|
|
Size: size,
|
|
|
}
|
|
|
}
|
|
|
-func (c *Conversion) ToConversion() {
|
|
|
+func (c *Conversion) ToConversion() (msg string) {
|
|
|
CL.Lock()
|
|
|
defer CL.Unlock()
|
|
|
// 检查目录是否存在
|
|
@@ -48,7 +47,7 @@ func (c *Conversion) ToConversion() {
|
|
|
// 创建输出文件夹
|
|
|
err := os.MkdirAll(filePath, 0755)
|
|
|
if err != nil {
|
|
|
- fmt.Println("Error creating output folder:", err)
|
|
|
+ msg = fmt.Sprintf("Error creating output folder:%s", err.Error())
|
|
|
return
|
|
|
}
|
|
|
}
|
|
@@ -56,20 +55,20 @@ func (c *Conversion) ToConversion() {
|
|
|
inputFile := fmt.Sprintf("%s/%s.%s", filePath, c.FileId, c.Suffix)
|
|
|
file, err := os.Create(inputFile)
|
|
|
if err != nil {
|
|
|
- fmt.Println("Error creating file:", err)
|
|
|
+ msg = fmt.Sprintf("Error creating file:%s", err.Error())
|
|
|
return
|
|
|
}
|
|
|
defer file.Close()
|
|
|
// 设置文件权限
|
|
|
err = file.Chmod(0777)
|
|
|
if err != nil {
|
|
|
- fmt.Printf("Error setting file permissions for %s: %v\n", filePath, err)
|
|
|
+ msg = fmt.Sprintf("Error setting file permissions for %s: %v\n", filePath, err)
|
|
|
return
|
|
|
}
|
|
|
// 写入文件流
|
|
|
_, err = file.Write(c.Content)
|
|
|
if err != nil {
|
|
|
- fmt.Println("Error writing to file:", err)
|
|
|
+ msg = fmt.Sprintf("Error writing to file:%s", err.Error())
|
|
|
return
|
|
|
}
|
|
|
// 开始执行转换
|
|
@@ -78,13 +77,13 @@ func (c *Conversion) ToConversion() {
|
|
|
cmd.Stderr = nil
|
|
|
err = cmd.Run()
|
|
|
if err != nil {
|
|
|
- log.Println(fmt.Errorf("conversion failed: %w", err))
|
|
|
+ msg = fmt.Sprintf("conversion failed: %s", err.Error())
|
|
|
return
|
|
|
}
|
|
|
pdfFile := fmt.Sprintf("%s/%s.%s", filePath, c.FileId, fileSuffix)
|
|
|
c.Content, err = os.ReadFile(pdfFile)
|
|
|
if err != nil {
|
|
|
- fmt.Println(fmt.Errorf("read pdf err:%s", err.Error()))
|
|
|
+ msg = fmt.Sprintf("read pdf err:%s", err.Error())
|
|
|
return
|
|
|
}
|
|
|
if len(c.Content) > 0 {
|
|
@@ -101,7 +100,7 @@ func (c *Conversion) ToConversion() {
|
|
|
Charset: util.GetFileChardet(c.Content),
|
|
|
})
|
|
|
if fileRes.OssDocId == "" {
|
|
|
- fmt.Println(" upload oss err:", fileRes.Msg)
|
|
|
+ msg = fmt.Sprintf(" upload oss err:%s", fileRes.Msg)
|
|
|
} else {
|
|
|
//移除文件
|
|
|
os.Remove(inputFile)
|
|
@@ -111,8 +110,9 @@ func (c *Conversion) ToConversion() {
|
|
|
OssPdfId: fmt.Sprintf("%s.%s", c.FileId, fileSuffix),
|
|
|
UpdateDate: time.Now(),
|
|
|
}); err != nil {
|
|
|
- log.Println(" update doc osspdfid err :", err.Error())
|
|
|
+ msg = fmt.Sprintf(" update doc osspdfid err :%s", err.Error())
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ return
|
|
|
}
|