From 9303b69ea569bcb5e581147543a3fd58e90d0d25 Mon Sep 17 00:00:00 2001 From: sunty <1172534965@qq.com> Date: 星期四, 20 八月 2020 20:05:23 +0800 Subject: [PATCH] add get buckets contrl --- extend/util/util.go | 192 ++++++++++------------------------------------- 1 files changed, 42 insertions(+), 150 deletions(-) diff --git a/extend/util/util.go b/extend/util/util.go index 3e74a89..f87adf7 100644 --- a/extend/util/util.go +++ b/extend/util/util.go @@ -1,16 +1,16 @@ package util import ( - "archive/tar" "archive/zip" + "basic.com/valib/logger.git" "bytes" - "compress/gzip" "crypto/md5" + "crypto/tls" "encoding/hex" "encoding/json" - "image" "io" "io/ioutil" + "net" "net/http" "os" "path/filepath" @@ -18,14 +18,10 @@ "time" "webserver/extend/code" - "basic.com/pubsub/protomsg.git" - "github.com/gin-gonic/gin" - "github.com/golang/glog" - "github.com/pierrec/lz4" - "gocv.io/x/gocv" - "crypto/rand" "fmt" + "github.com/gin-gonic/gin" + "github.com/pierrec/lz4" "reflect" "strings" ) @@ -45,7 +41,6 @@ // ResponseFormat 杩斿洖鏁版嵁鏍煎紡鍖� func ResponseFormat(c *gin.Context, respStatus *code.Code, data interface{}) { if respStatus == nil { - glog.Error("response status param not found!") respStatus = code.RequestParamError } c.JSON(respStatus.Status, gin.H{ @@ -97,49 +92,6 @@ return nil, err } return pix, nil -} - -// 鎸夊昂瀵稿幓鍒囧浘 -func SubImg(i protomsg.Image, x0, y0, x1, y1 int) []byte { - img, _ := gocv.NewMatFromBytes(int(i.Height), int(i.Width), gocv.MatTypeCV8UC3, i.Data) - rect := image.Rect(EnlargeSize(x0, y0, x1, y1, i)) - region := img.Region(rect) - bytes, _ := gocv.IMEncode(".jpg", region) - return bytes -} - -// 闀垮鍙樹负涓�姣斾竴锛屾瘡杈瑰悇鎵╃櫨鍒嗕箣20 -func EnlargeSize(x0, y0, x1, y1 int, i protomsg.Image) (x0_new, y0_new, x1_new, y1_new int) { - // 鍏堟妸闀垮鍙樹负涓�姣斾竴 - chazhi := (y1 - y0) - (x1 - x0) - x0 = x0 - chazhi/2 - if x0 < 0 { - x0 = 0 - } - x1 = x1 + chazhi/2 - if x1 > int(i.Width) { - x1 = int(i.Width) - } - - // 鍐嶆妸姣忚竟鍚勬墿澶х櫨鍒嗕箣20 - enlarge := float32(0.2) - x0_new = int((1+enlarge)*float32(x0) - enlarge*float32(x1)) - if x0_new < 0 { - x0_new = 0 - } - x1_new = int((1+enlarge)*float32(x1) - enlarge*float32(x0)) - if x1_new > int(i.Width) { - x1_new = int(i.Width) - } - y0_new = int((1+enlarge)*float32(y0) - enlarge*float32(y1)) - if y0_new < 0 { - y0_new = 0 - } - y1_new = int((1+enlarge)*float32(y1) - enlarge*float32(y0)) - if y1_new > int(i.Height) { - y1_new = int(i.Height) - } - return } func StringIpToInt(ipstring string) int { @@ -302,103 +254,6 @@ return nil } -//鍘嬬缉 浣跨敤gzip鍘嬬缉鎴恡ar.gz -func TarCompress(files []*os.File, dest string) error { - d, _ := os.Create(dest) - defer d.Close() - gw := gzip.NewWriter(d) - defer gw.Close() - tw := tar.NewWriter(gw) - defer tw.Close() - for _, file := range files { - err := gzipCompress(file, "", tw) - if err != nil { - return err - } - } - return nil -} - -func gzipCompress(file *os.File, prefix string, tw *tar.Writer) error { - info, err := file.Stat() - if err != nil { - return err - } - if info.IsDir() { - prefix = prefix + "/" + info.Name() - fileInfos, err := file.Readdir(-1) - if err != nil { - return err - } - for _, fi := range fileInfos { - f, err := os.Open(file.Name() + "/" + fi.Name()) - if err != nil { - return err - } - err = gzipCompress(f, prefix, tw) - if err != nil { - return err - } - } - } else { - header, err := tar.FileInfoHeader(info, "") - header.Name = prefix + "/" + header.Name - if err != nil { - return err - } - err = tw.WriteHeader(header) - if err != nil { - return err - } - _, err = io.Copy(tw, file) - file.Close() - if err != nil { - return err - } - } - return nil -} - -//瑙e帇 tar.gz -func DeCompress(tarFile, dest string) error { - srcFile, err := os.Open(tarFile) - if err != nil { - return err - } - defer srcFile.Close() - gr, err := gzip.NewReader(srcFile) - if err != nil { - return err - } - defer gr.Close() - tr := tar.NewReader(gr) - for { - hdr, err := tr.Next() - if err != nil { - if err == io.EOF { - break - } else { - return err - } - } - filename := dest + hdr.Name - file, err := createFile(filename) - if err != nil { - return err - } - io.Copy(file, tr) - } - return nil -} - -func createFile(name string) (*os.File, error) { - err := os.MkdirAll(string([]rune(name)[0:strings.LastIndex(name, "/")]), 0755) - if err != nil { - return nil, err - } - return os.Create(name) -} - func FormatNum(oNum int,n int) string { m := 0 for { @@ -426,4 +281,41 @@ } return hex.EncodeToString(_md5.Sum(nil)),nil +} + +func DownLoad(url string)([]byte,error){ + connectTimeout := 5 * time.Second + readWriteTimeout := 10000 * time.Millisecond + c := &http.Client{ + Transport: &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + Dial: TimeoutDialer(connectTimeout, readWriteTimeout), + }, + } + req, err := http.NewRequest("GET",url,nil) + if err != nil { + return nil,err + } + resp,err := c.Do(req) + + body, err1 := ioutil.ReadAll(resp.Body) + if err1 != nil { + resp.Body.Close() + return nil,err + }else { + logger.Debug("Download success") + } + resp.Body.Close() + return body,nil +} + +func TimeoutDialer(cTimeout time.Duration, rwTimeout time.Duration) func(net, addr string) (c net.Conn, err error) { + return func(netw, addr string) (net.Conn, error) { + conn, err := net.DialTimeout(netw, addr, cTimeout) + if err != nil { + return nil, err + } + conn.SetDeadline(time.Now().Add(rwTimeout)) + return conn, nil + } } \ No newline at end of file -- Gitblit v1.8.0