From 4b45273f8970beddf8f788a9f90071b0ead0b4e2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 11 二月 2020 18:27:54 +0800
Subject: [PATCH] add clearData
---
extend/util/util.go | 98 +++++++++++++++++++-----------------------------
1 files changed, 39 insertions(+), 59 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index 9ff0e64..38017e1 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -1,17 +1,17 @@
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"
@@ -21,7 +21,6 @@
"basic.com/pubsub/protomsg.git"
"github.com/gin-gonic/gin"
- "github.com/golang/glog"
"github.com/pierrec/lz4"
"gocv.io/x/gocv"
@@ -46,7 +45,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{
@@ -303,61 +301,6 @@
return nil
}
-func TarGzCheck(filePath string) bool {
- f, err := os.Open(filePath)
- if err != nil {
- return false
- }
- defer f.Close()
- buf := make([]byte, 4)
- if n, err := f.Read(buf); err != nil || n < 4 {
- return false
- }
- fType := hex.EncodeToString(buf)
- logger.Debug("file type :",fType)
- return fType == "8b1f"
-}
-
-//瑙ｅ帇 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 {
@@ -385,4 +328,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