test

upload/upload.go

@@ -2,7 +2,6 @@ package upload
 
 import (
 	"archive/zip"
-	"bytes"
 	"crypto/md5"
 	"encoding/hex"
 	"encoding/json"
@@ -10,22 +9,16 @@ import (
 	"fmt"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/astaxie/beego/orm"
-	"github.com/chai2010/webp"
-	"image/jpeg"
-	"image/png"
 	"io"
 	"io/ioutil"
 	"mime"
 	"net/http"
 	"net/http/cookiejar"
+	Qurl "net/url"
 	"os"
 	"path"
 	"ppt_server/models"
 	"regexp"
-	"image"
-	"runtime/debug"
-
-	Qurl "net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -492,31 +485,33 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) error {
 	if err != nil {
 		return err
 	}
+
 	defer fc.Close()
-	var img image.Image
-	fileSuffix := path.Ext(file.Name) //获取文件后缀
-	switch fileSuffix {
-	case ".png":
-		img, _ = png.Decode(fc)
-	case ".jpeg":
-		img, _ = jpeg.Decode(fc)
-	default:
-		return errors.New("image ext is not found")
-	}
 
-	var buf bytes.Buffer
-	if err = webp.Encode(&buf, img, &webp.Options{Lossless:true}); err != nil {
-		return err
-	}
+	//var img image.Image
+	fileSuffix := path.Ext(file.Name) //获取文件后缀
+	//switch fileSuffix {
+	//case ".png":
+	//	img, _ = png.Decode(fc)
+	//case ".jpeg":
+	//	img, _ = jpeg.Decode(fc)
+	//default:
+	//	return errors.New("image ext is not found")
+	//}
+	//
+	//var buf bytes.Buffer
+	//if err = webp.Encode(&buf, img, &webp.Options{Lossless:true}); err != nil {
+	//	return err
+	//}
 
 	objectPathName := objectPath + "images/"
 
 	var filenameOnly string
 	filenameOnly = strings.TrimRight(file.Name, fileSuffix)
 	filenameOnly = strings.Replace(filenameOnly, "p", "", -1)
-	fileName := fmt.Sprintf("%05s", filenameOnly) + ".webp"
-	defer debug.FreeOSMemory()
-	return bucket.PutObject(objectPathName+fileName, bytes.NewReader(buf.Bytes()))
+	fileName := fmt.Sprintf("%05s", filenameOnly) + fileSuffix
+	//defer debug.FreeOSMemory()
+	return bucket.PutObject(objectPathName+fileName, fc)
 
 }