Commit b7892a08 by Li Feifei

test

parent ccde4db9
Pipeline #14610 passed with stages
in 59 seconds
...@@ -2,6 +2,7 @@ package upload ...@@ -2,6 +2,7 @@ package upload
import ( import (
"archive/zip" "archive/zip"
"bytes"
"crypto/md5" "crypto/md5"
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
...@@ -9,6 +10,10 @@ import ( ...@@ -9,6 +10,10 @@ import (
"fmt" "fmt"
"github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/aliyun/aliyun-oss-go-sdk/oss"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/chai2010/webp"
"image"
"image/jpeg"
"image/png"
"io" "io"
"io/ioutil" "io/ioutil"
"mime" "mime"
...@@ -488,21 +493,23 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) error { ...@@ -488,21 +493,23 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) error {
defer fc.Close() defer fc.Close()
//var img image.Image var img image.Image
fileSuffix := path.Ext(file.Name) //获取文件后缀 fileSuffix := path.Ext(file.Name) //获取文件后缀
//switch fileSuffix { switch fileSuffix {
//case ".png": case ".png":
// img, _ = png.Decode(fc) img, _ = png.Decode(fc)
//case ".jpeg": case ".jpeg":
// img, _ = jpeg.Decode(fc) img, _ = jpeg.Decode(fc)
//default: default:
// return errors.New("image ext is not found") return errors.New("image ext is not found")
//} }
//
//var buf bytes.Buffer var buf bytes.Buffer
//if err = webp.Encode(&buf, img, &webp.Options{Lossless:true}); err != nil {
// return err if err = webp.Encode(&buf, img, &webp.Options{Lossless:true}); err != nil {
//} return err
}
defer buf.Reset()
objectPathName := objectPath + "images/" objectPathName := objectPath + "images/"
...@@ -510,7 +517,6 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) error { ...@@ -510,7 +517,6 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) error {
filenameOnly = strings.TrimRight(file.Name, fileSuffix) filenameOnly = strings.TrimRight(file.Name, fileSuffix)
filenameOnly = strings.Replace(filenameOnly, "p", "", -1) filenameOnly = strings.Replace(filenameOnly, "p", "", -1)
fileName := fmt.Sprintf("%05s", filenameOnly) + fileSuffix fileName := fmt.Sprintf("%05s", filenameOnly) + fileSuffix
//defer debug.FreeOSMemory()
return bucket.PutObject(objectPathName+fileName, fc) return bucket.PutObject(objectPathName+fileName, fc)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment