From bc2164deb67e29d5ea9301244f2f1525ec30cac9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 11 三月 2020 10:12:27 +0800
Subject: [PATCH] fix swagger
---
extend/util/util.go | 247 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 193 insertions(+), 54 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index 8f7883c..38017e1 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -1,19 +1,28 @@
package util
import (
- "basic.com/pubsub/protomsg.git"
+ "archive/zip"
+ "basic.com/valib/logger.git"
"bytes"
+ "crypto/md5"
+ "crypto/tls"
+ "encoding/hex"
"encoding/json"
- "errors"
+ "image"
+ "io"
+ "io/ioutil"
+ "net"
+ "net/http"
+ "os"
+ "path/filepath"
+ "strconv"
+ "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"
- "image"
- "net"
- "os/exec"
- "strconv"
- "webserver/extend/code"
"crypto/rand"
"fmt"
@@ -36,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{
@@ -58,14 +66,14 @@
//struct杞琺ap
func Struct2Map(obj interface{}) map[string]interface{} {
- resultMap :=make(map[string]interface{},0)
+ resultMap := make(map[string]interface{}, 0)
bytesData, err := json.Marshal(obj)
- if err !=nil {
+ if err != nil {
return resultMap
}
json.Unmarshal(bytesData, &resultMap)
return resultMap
-
+
//
//t := reflect.TypeOf(obj)
//v := reflect.ValueOf(obj)
@@ -77,8 +85,21 @@
//return data
}
+func ReadImgData(url string) ([]byte, error) {
+ resp, err := http.Get(url)
+ if err != nil {
+ return nil, err
+ }
+ defer resp.Body.Close()
+ pix, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ return nil, err
+ }
+ return pix, nil
+}
+
// 鎸夊昂瀵稿幓鍒囧浘
-func SubImg(i protomsg.Image, x0, y0, x1, y1 int, ) []byte {
+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)
@@ -120,46 +141,6 @@
return
}
-
-// 鑾峰彇鏈満缃戝崱IP
-func GetLocalIP(networkName string) (ipv4 string,mask string, err error) {
- interfaces, err := net.Interfaces()
- if err != nil {
- return "","", err
- }
-
- for _, i := range interfaces {
- byName, err := net.InterfaceByName(i.Name)
- if err != nil {
- return "","", err
- }
- addresses, err := byName.Addrs()
- for _, v := range addresses {
- if ipnet, ok:=v.(*net.IPNet);ok && !ipnet.IP.IsLoopback(){
- if ipnet.IP.To4() !=nil{
- if byName.Name == networkName{
- maskStr := ipnet.Mask.String()
- mask64, _ := strconv.ParseUint(maskStr, 16, 32)
- return ipnet.IP.String(),IpIntToString(int(mask64)),nil
- }
- }
- }
- }
- }
- return "","", errors.New("ipv4 not found")
-}
-
-func GetDefaultRoute(networkName string)(route string,err error){
- cmdStr := fmt.Sprintf("route | grep -P \"^default.*%s$\" | awk '{print $2}'",networkName)
- cmd := exec.Command("/bin/sh","-c",cmdStr)
- b, err := cmd.Output()
- if err!=nil{
- return "",err
- }
- return string(b),nil
-
-}
-
func StringIpToInt(ipstring string) int {
ipSegs := strings.Split(ipstring, ".")
var ipInt int = 0
@@ -173,7 +154,7 @@
return ipInt
}
-func IpIntToString(ipInt int) string{
+func IpIntToString(ipInt int) string {
ipSegs := make([]string, 4)
var len int = len(ipSegs)
buffer := bytes.NewBufferString("")
@@ -198,6 +179,14 @@
}
f, _ := strconv.ParseFloat(fmt.Sprintf("%2.2f", compareScore), 32)
return float32(f)
+}
+
+func ParseScore64(compareScore float64) float64 {
+ if compareScore < 1 {
+ compareScore = compareScore * 100
+ }
+ f, _ := strconv.ParseFloat(fmt.Sprintf("%2.2f", compareScore), 64)
+ return f
}
// UnCompress uncompress
@@ -227,3 +216,153 @@
out = out[:n] // compressed data
return out, nil
}
+
+// 鍒ゆ柇鎵�缁欒矾寰勬枃浠�/鏂囦欢澶规槸鍚﹀瓨鍦�
+func Exists(path string) bool {
+ if path == "" {
+ return false
+ }
+ _, err := os.Stat(path) //os.Stat鑾峰彇鏂囦欢淇℃伅
+ if err != nil {
+ if os.IsExist(err) {
+ return true
+ }
+ return false
+ }
+ return true
+}
+func CreateDirectory(path string) bool {
+ if path == "" {
+ return false
+ }
+ if Exists(path) {
+ return true
+ }
+ err := os.MkdirAll(path,os.ModePerm)
+ if err !=nil {
+ return false
+ }
+ return true
+}
+
+//鏃ユ湡杞瓧绗︿覆
+func FormatDate(date time.Time, layout string) string {
+ layout = strings.Replace(layout, "yyyy", "2006", 1)
+ layout = strings.Replace(layout, "yy", "06", 1)
+ layout = strings.Replace(layout, "MM", "01", 1)
+ layout = strings.Replace(layout, "dd", "02", 1)
+ layout = strings.Replace(layout, "HH", "15", 1)
+ layout = strings.Replace(layout, "mm", "04", 1)
+ layout = strings.Replace(layout, "ss", "05", 1)
+ layout = strings.Replace(layout, "SSS", "000", -1)
+ return date.Format(layout)
+}
+func ZipCheck(zipPath string) bool {
+ f, err := os.Open(zipPath)
+ if err != nil {
+ return false
+ }
+ defer f.Close()
+ buf := make([]byte, 4)
+ if n, err := f.Read(buf); err != nil || n < 4 {
+ return false
+ }
+ return bytes.Equal(buf, []byte("PK\x03\x04"))
+}
+func UnZip(archive, target string) error {
+ reader, err := zip.OpenReader(archive)
+ if err != nil {
+ return err
+ }
+ if err := os.MkdirAll(target, 0755); err != nil {
+ return err
+ }
+ for _, file := range reader.File {
+ path := filepath.Join(target, file.Name)
+ if file.FileInfo().IsDir() {
+ os.MkdirAll(path, file.Mode())
+ continue
+ }
+ fileReader, err := file.Open()
+ if err != nil {
+ return err
+ }
+ defer fileReader.Close()
+ targetFile, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, file.Mode())
+ if err != nil {
+ return err
+ }
+ defer targetFile.Close()
+ if _, err := io.Copy(targetFile, fileReader); err != nil {
+ return err
+ }
+ }
+
+ 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