From 2c84a93c4faad5e09900fc71f045a181bdb313a6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 05 三月 2020 18:55:26 +0800
Subject: [PATCH] fix
---
extend/util/util.go | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index 845ff42..38017e1 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -2,11 +2,16 @@
import (
"archive/zip"
+ "basic.com/valib/logger.git"
"bytes"
+ "crypto/md5"
+ "crypto/tls"
+ "encoding/hex"
"encoding/json"
"image"
"io"
"io/ioutil"
+ "net"
"net/http"
"os"
"path/filepath"
@@ -16,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"
@@ -41,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{
@@ -296,4 +299,70 @@
}
return nil
+}
+
+func FormatNum(oNum int,n int) string {
+ m := 0
+ for {
+ oNum = oNum / 10
+ m++
+ if oNum == 0 {
+ break
+ }
+ }
+ fmtStr := "%0"+strconv.Itoa(m)+"d"
+ return fmt.Sprintf(fmtStr, n)
+}
+
+func FileMd5(path string) (string,error){
+ file, err := os.Open(path)
+ if err !=nil {
+ return "",err
+ }
+
+ defer file.Close()
+
+ _md5 := md5.New()
+ if _,err := io.Copy(_md5, file);err != nil {
+ return "",err
+ }
+
+ 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