From d9e01c51a525adf4f2393a95f87604e3b6e79ad2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 19 十一月 2019 15:57:19 +0800
Subject: [PATCH] fix all
---
extend/util/util.go | 82 ++++++++++-------------------------------
1 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index 16aecd5..542dd2c 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -1,21 +1,19 @@
package util
import (
- "basic.com/pubsub/protomsg.git"
"bytes"
"encoding/json"
- "errors"
+ "image"
+ "io/ioutil"
+ "net/http"
+ "strconv"
+ "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"
- "io/ioutil"
- "net"
- "net/http"
- "os/exec"
- "strconv"
- "webserver/extend/code"
"crypto/rand"
"fmt"
@@ -60,14 +58,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)
@@ -79,21 +77,21 @@
//return data
}
-func ReadImgData(url string) ([]byte,error) {
- resp,err := http.Get(url)
- if err !=nil {
- return nil,err
+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
+ pix, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ return nil, err
}
- return pix,nil
+ 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)
@@ -135,46 +133,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
@@ -188,7 +146,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("")
--
Gitblit v1.8.0