close transformation webp

upload/upload.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/astaxie/beego/orm"
-	"github.com/chai2010/webp"
 	"github.com/rocketlaunchr/go-pool"
 	"github.com/xxjwxc/gowp/workpool"
 	"image"
@@ -461,11 +460,11 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte
 	}
 
 	defer fc.Close()
-	item := syncPool.Borrow()
-	defer item.Return()
-	item.MarkAsInvalid()
-
-	buf := item.Item.(*bytes.Buffer)
+	//item := syncPool.Borrow()
+	//defer item.Return()
+	//item.MarkAsInvalid()
+	//
+	//buf := item.Item.(*bytes.Buffer)
 
 	var img image.Image
 	fileSuffix := path.Ext(file.Name) //获取文件后缀
@@ -479,17 +478,17 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte
 		return nil, errors.New("image ext is not found")
 	}
 
-	if err = webp.Encode(buf, img, &webp.Options{Lossless: true}); err != nil {
-		return nil, err
-	}
-	r := bytes.NewReader(buf.Bytes())
+	//if err = webp.Encode(buf, img, &webp.Options{Lossless: true}); err != nil {
+	//	return nil, err
+	//}
+	//r := bytes.NewReader(buf.Bytes())
 
 	objectPathName := objectPath + "images/"
 
 	var filenameOnly string
 	filenameOnly = strings.TrimRight(file.Name, fileSuffix)
 	filenameOnly = strings.Replace(filenameOnly, "p", "", -1)
-	fileName := fmt.Sprintf("%05s", filenameOnly) + ".webp"
+	fileName := fmt.Sprintf("%05s", filenameOnly) + fileSuffix
 
 	info := img.Bounds()
 	var imageInfo []interface{}
@@ -497,7 +496,7 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte
 	imageInfo = append(imageInfo, info.Max.X)
 	imageInfo = append(imageInfo, info.Max.Y)
 
-	return imageInfo, bucket.PutObject(objectPathName+fileName, r)
+	return imageInfo, bucket.PutObject(objectPathName+fileName, fc)
 
 }