fix: minio

controllers/voice.go

@@ -6,6 +6,7 @@ import (
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
 	"fmt"
+	"github.com/kgiannakakis/mp3duration/src/mp3duration"
 	"github.com/rdlucklib/rdluck_tools/file"
 	"github.com/rdlucklib/rdluck_tools/http"
 	"io/ioutil"
@@ -104,11 +105,16 @@ func (this *VoiceController) Upload() {
 		br.ErrMsg = "资源上传失败,Err:" + err.Error()
 		return
 	}
-	playSeconds, err := utils.GetVideoPlaySeconds(fpath)
-	if err != nil {
-		br.Msg = "获取音频时间失败"
-		br.ErrMsg = "获取音频时间失败,Err:" + err.Error()
-		return
+
+	var playSeconds float64
+	playSeconds, err = mp3duration.Calculate(fpath)
+	if playSeconds <= 0 {
+		playSeconds, err = utils.GetVideoPlaySeconds(fpath)
+		if err != nil {
+			br.Msg = "获取音频时间失败"
+			br.ErrMsg = "获取音频时间失败,Err:" + err.Error()
+			return
+		}
 	}
 	createTime := report.CreateTime.Format("0102")
 	videoName := report.Title + "(" + createTime + ")"

services/minio.go

@@ -117,7 +117,7 @@ func UploadMinIo() {
 	log.Printf("Successfully uploaded %s of size %d\n", objectName, info.Size)
 }
 
-//UploadImgToMinIo 图片上传
+// UploadImgToMinIo 图片上传
 func UploadImgToMinIo(fileName, filePath string) (string, error) {
 	if utils.MinIoAccessKeyId == `` || utils.MinIoAccessKeySecret == `` {
 		return "0", errors.New("MinIo信息未配置")
@@ -165,7 +165,6 @@ func UploadAudioToMinIo(fileName, filePath string) (string, error) {
 		return "0", errors.New("MinIo信息未配置")
 	}
 
-
 	ctx := context.Background()
 	endpoint := utils.MinIoEndpoint
 	accessKeyID := utils.MinIoAccessKeyId
@@ -197,7 +196,7 @@ func UploadAudioToMinIo(fileName, filePath string) (string, error) {
 
 	// Upload the zip file with FPutObject
 	//contentType := "application/xlsx"
-	_, err = minioClient.FPutObject(ctx, bucketName, fileName, filePath, minio.PutObjectOptions{})
+	_, err = minioClient.FPutObject(ctx, bucketName, path, filePath, minio.PutObjectOptions{})
 	if err != nil {
 		log.Fatalln(err)
 		return "3", err
@@ -318,7 +317,7 @@ func UploadMinIoToDir(filename, filePath, uploadDir, fileDir string) (string, er
 	})
 	if err != nil {
 		log.Fatalln(err)
-		return "1",err
+		return "1", err
 	}
 	bucketName := utils.MinIoBucketname
 	// Check to see if we already own this bucket (which happens if you run this twice)
@@ -327,7 +326,7 @@ func UploadMinIoToDir(filename, filePath, uploadDir, fileDir string) (string, er
 		log.Printf("We already own %s\n", bucketName)
 	} else {
 		log.Fatalln(err)
-		return "2",err
+		return "2", err
 	}
 	if uploadDir == "" {
 		uploadDir = utils.MinIoUploadDir