From 63873fc1fea408c201cef5cfedb3a9bdaeab5b4d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 16 十二月 2019 17:05:21 +0800
Subject: [PATCH] add patchUpdate
---
extend/util/util.go | 139 ++++++++++++++++++++++++++++++++--------------
1 files changed, 97 insertions(+), 42 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index e680ee6..845ff42 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -1,15 +1,17 @@
package util
import (
+ "archive/zip"
"bytes"
"encoding/json"
- "errors"
"image"
+ "io"
"io/ioutil"
- "net"
"net/http"
- "os/exec"
+ "os"
+ "path/filepath"
"strconv"
+ "time"
"webserver/extend/code"
"basic.com/pubsub/protomsg.git"
@@ -136,45 +138,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("ip route show | grep -P \"^default.*%s\" | awk '{print $3}'", 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
@@ -215,6 +178,14 @@
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
func UnCompress(in []byte) ([]byte, error) {
out := make([]byte, 10*len(in))
@@ -242,3 +213,87 @@
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
+}
\ No newline at end of file
--
Gitblit v1.8.0