|
@@ -81,6 +81,13 @@ func CreateVideo(report *models.Report) (err error) {
|
|
|
//if utils.FileIsExist(savePath) {
|
|
|
// os.Remove(savePath)
|
|
|
//}
|
|
|
+
|
|
|
+ // 如果没有文本内容,那么就不生成了
|
|
|
+ videoContent = strings.TrimSpace(videoContent)
|
|
|
+ if videoContent == `` {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
contentArr := GetChineseCount(videoContent)
|
|
|
for _, v := range contentArr {
|
|
|
newText := v
|
|
@@ -124,7 +131,7 @@ func CreateVideo(report *models.Report) (err error) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- fileBody, err := ioutil.ReadFile(savePath)
|
|
|
+ fileBody, err := os.ReadFile(savePath)
|
|
|
videoSize := len(fileBody)
|
|
|
sizeFloat := (float64(videoSize) / float64(1024)) / float64(1024)
|
|
|
sizeStr := utils.SubFloatToFloatStr(sizeFloat, 2)
|
|
@@ -144,6 +151,7 @@ func CreateVideo(report *models.Report) (err error) {
|
|
|
}
|
|
|
}
|
|
|
err = models.ModifyReportVideo(report.Id, uploadUrl, videoName, sizeStr, playSeconds)
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
@@ -235,7 +243,10 @@ func CreateReportVideo(reportTitle, reportContent, reportTime string) (uploadUrl
|
|
|
//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "CreateReportVideo, reportTitle:" + reportTitle +", Err:"+err.Error(), utils.EmailSendToUsers)
|
|
|
}
|
|
|
}()
|
|
|
- if reportContent == "" {
|
|
|
+
|
|
|
+ // 如果没有文本内容,那么就不生成了
|
|
|
+ reportContent = strings.TrimSpace(reportContent)
|
|
|
+ if reportContent == `` {
|
|
|
return
|
|
|
}
|
|
|
|