From 64627f1348bbc185a8c12404ce8494223a6fb47f Mon Sep 17 00:00:00 2001
From: huangjuajun <102564160@qq.com>
Date: Mon, 30 May 2022 11:12:57 +0800
Subject: [PATCH] add Reverse:for v1.0.7

---
 e/code.go                         | 2 +-
 e/error.go                        | 2 +-
 e/msg.go                          | 2 +-
 e/set_cache.go                    | 2 +-
 utils/base64.go                   | 3 +--
 utils/boolean.go                  | 2 +-
 utils/cache/base.go               | 2 +-
 utils/cache/cache/cache.go        | 2 +-
 utils/cache/cache/conv.go         | 2 +-
 utils/cache/cache/file.go         | 2 +-
 utils/cache/cache/memory.go       | 2 +-
 utils/cache/redis.go              | 2 +-
 utils/cache/redis_cluster.go      | 2 +-
 utils/cache/redis_pool.go         | 2 +-
 utils/cache/redis_pool_cluster.go | 2 +-
 utils/convert.go                  | 2 +-
 utils/crypto.go                   | 2 +-
 utils/curl.go                     | 2 +-
 utils/debug.go                    | 2 +-
 utils/distance.go                 | 2 +-
 utils/duplicate.go                | 2 +-
 utils/file.go                     | 2 +-
 utils/file_and_dir.go             | 2 +-
 utils/format.go                   | 2 +-
 utils/json.go                     | 2 +-
 utils/logx/log.go                 | 2 +-
 utils/logx/output.go              | 2 +-
 utils/logx/sugar.go               | 2 +-
 utils/map_and_struct.go           | 2 +-
 utils/md5.go                      | 2 +-
 utils/qrcode/decodeFile.go        | 2 +-
 utils/qrcode/getBase64.go         | 2 +-
 utils/qrcode/saveFile.go          | 2 +-
 utils/qrcode/writeWeb.go          | 2 +-
 utils/rand.go                     | 2 +-
 utils/rsa.go                      | 2 +-
 utils/serialize.go                | 2 +-
 utils/shuffle.go                  | 2 +-
 utils/sign_check.go               | 2 +-
 utils/slice.go                    | 2 +-
 utils/slice_and_string.go         | 2 +-
 utils/string.go                   | 2 +-
 utils/struct2UrlParams.go         | 2 +-
 utils/time.go                     | 2 +-
 utils/translate.go                | 2 +-
 utils/trim_html.go                | 2 +-
 utils/uuid.go                     | 2 +-
 47 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/e/code.go b/e/code.go
index 8d241c9..430ad3b 100644
--- a/e/code.go
+++ b/e/code.go
@@ -1,4 +1,4 @@
-package e
+package zhios_tool_e
 
 const (
 	// 200 因为部分第三方接口不能返回错误头,因此在此定义部分错误
diff --git a/e/error.go b/e/error.go
index 2564174..5178876 100644
--- a/e/error.go
+++ b/e/error.go
@@ -1,4 +1,4 @@
-package e
+package zhios_tool_e
 
 import (
 	"fmt"
diff --git a/e/msg.go b/e/msg.go
index 18afb7c..894cdc5 100644
--- a/e/msg.go
+++ b/e/msg.go
@@ -1,4 +1,4 @@
-package e
+package zhios_tool_e
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_tools.git/utils"
diff --git a/e/set_cache.go b/e/set_cache.go
index 45337a1..a902985 100644
--- a/e/set_cache.go
+++ b/e/set_cache.go
@@ -1,4 +1,4 @@
-package e
+package zhios_tool_e
 
 func SetCache(cacheTime int64) map[string]interface{} {
 	if cacheTime == 0 {
diff --git a/utils/base64.go b/utils/base64.go
index 97ec434..4d6213d 100644
--- a/utils/base64.go
+++ b/utils/base64.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"encoding/base64"
@@ -95,7 +95,6 @@ func base64Encode(encode int) *base64.Encoding {
 	}
 }
 
-
 func JudgeBase64(str string) bool {
 	pattern := "^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)$"
 	matched, err := regexp.MatchString(pattern, str)
diff --git a/utils/boolean.go b/utils/boolean.go
index d64c876..0e8b17c 100644
--- a/utils/boolean.go
+++ b/utils/boolean.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import "reflect"
 
diff --git a/utils/cache/base.go b/utils/cache/base.go
index 64648dd..5499c53 100644
--- a/utils/cache/base.go
+++ b/utils/cache/base.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"errors"
diff --git a/utils/cache/cache/cache.go b/utils/cache/cache/cache.go
index e43c5f0..eec5786 100644
--- a/utils/cache/cache/cache.go
+++ b/utils/cache/cache/cache.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"fmt"
diff --git a/utils/cache/cache/conv.go b/utils/cache/cache/conv.go
index 6b700ae..82c7cbb 100644
--- a/utils/cache/cache/conv.go
+++ b/utils/cache/cache/conv.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"fmt"
diff --git a/utils/cache/cache/file.go b/utils/cache/cache/file.go
index 5c4e366..e7e7b3b 100644
--- a/utils/cache/cache/file.go
+++ b/utils/cache/cache/file.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"bytes"
diff --git a/utils/cache/cache/memory.go b/utils/cache/cache/memory.go
index 0cc5015..fec3888 100644
--- a/utils/cache/cache/memory.go
+++ b/utils/cache/cache/memory.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"encoding/json"
diff --git a/utils/cache/redis.go b/utils/cache/redis.go
index 4e5f047..b04cc80 100644
--- a/utils/cache/redis.go
+++ b/utils/cache/redis.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"encoding/json"
diff --git a/utils/cache/redis_cluster.go b/utils/cache/redis_cluster.go
index 901f30c..4193132 100644
--- a/utils/cache/redis_cluster.go
+++ b/utils/cache/redis_cluster.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"strconv"
diff --git a/utils/cache/redis_pool.go b/utils/cache/redis_pool.go
index ca38b3f..ad9d90a 100644
--- a/utils/cache/redis_pool.go
+++ b/utils/cache/redis_pool.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"errors"
diff --git a/utils/cache/redis_pool_cluster.go b/utils/cache/redis_pool_cluster.go
index cd1911b..418d52c 100644
--- a/utils/cache/redis_pool_cluster.go
+++ b/utils/cache/redis_pool_cluster.go
@@ -1,4 +1,4 @@
-package cache
+package zhios_tool_cache
 
 import (
 	"strconv"
diff --git a/utils/convert.go b/utils/convert.go
index 5fc1076..8186459 100644
--- a/utils/convert.go
+++ b/utils/convert.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"encoding/binary"
diff --git a/utils/crypto.go b/utils/crypto.go
index 56289c5..9746c6a 100644
--- a/utils/crypto.go
+++ b/utils/crypto.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"crypto/md5"
diff --git a/utils/curl.go b/utils/curl.go
index 0a45607..5fd5484 100644
--- a/utils/curl.go
+++ b/utils/curl.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"bytes"
diff --git a/utils/debug.go b/utils/debug.go
index bb2e9d3..97f66ac 100644
--- a/utils/debug.go
+++ b/utils/debug.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"fmt"
diff --git a/utils/distance.go b/utils/distance.go
index 2a6923b..de6a319 100644
--- a/utils/distance.go
+++ b/utils/distance.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import "math"
 
diff --git a/utils/duplicate.go b/utils/duplicate.go
index 17cea88..ee065fb 100644
--- a/utils/duplicate.go
+++ b/utils/duplicate.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 func RemoveDuplicateString(elms []string) []string {
 	res := make([]string, 0, len(elms))
diff --git a/utils/file.go b/utils/file.go
index 93ed08f..96261e2 100644
--- a/utils/file.go
+++ b/utils/file.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"os"
diff --git a/utils/file_and_dir.go b/utils/file_and_dir.go
index 93141f9..f4acbd2 100644
--- a/utils/file_and_dir.go
+++ b/utils/file_and_dir.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import "os"
 
diff --git a/utils/format.go b/utils/format.go
index e5e2d40..d78252d 100644
--- a/utils/format.go
+++ b/utils/format.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"math"
diff --git a/utils/json.go b/utils/json.go
index 2905833..d3cbbdf 100644
--- a/utils/json.go
+++ b/utils/json.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"bytes"
diff --git a/utils/logx/log.go b/utils/logx/log.go
index ca11223..9208a7f 100644
--- a/utils/logx/log.go
+++ b/utils/logx/log.go
@@ -1,4 +1,4 @@
-package logx
+package zhios_tool_logx
 
 import (
 	"os"
diff --git a/utils/logx/output.go b/utils/logx/output.go
index ef33f0b..d6118e7 100644
--- a/utils/logx/output.go
+++ b/utils/logx/output.go
@@ -1,4 +1,4 @@
-package logx
+package zhios_tool_logx
 
 import (
 	"bytes"
diff --git a/utils/logx/sugar.go b/utils/logx/sugar.go
index ab380fc..22caede 100644
--- a/utils/logx/sugar.go
+++ b/utils/logx/sugar.go
@@ -1,4 +1,4 @@
-package logx
+package zhios_tool_logx
 
 import (
 	"errors"
diff --git a/utils/map_and_struct.go b/utils/map_and_struct.go
index 34904ce..2097650 100644
--- a/utils/map_and_struct.go
+++ b/utils/map_and_struct.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"encoding/json"
diff --git a/utils/md5.go b/utils/md5.go
index 52c108d..53e7da7 100644
--- a/utils/md5.go
+++ b/utils/md5.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"crypto/md5"
diff --git a/utils/qrcode/decodeFile.go b/utils/qrcode/decodeFile.go
index f50fb28..bbfc246 100644
--- a/utils/qrcode/decodeFile.go
+++ b/utils/qrcode/decodeFile.go
@@ -1,4 +1,4 @@
-package qrcode
+package zhios_tool_qrcode
 
 import (
 	"image"
diff --git a/utils/qrcode/getBase64.go b/utils/qrcode/getBase64.go
index 2d0fe75..38899d8 100644
--- a/utils/qrcode/getBase64.go
+++ b/utils/qrcode/getBase64.go
@@ -1,4 +1,4 @@
-package qrcode
+package zhios_tool_qrcode
 
 // 生成登录二维码图片, 方便在网页上显示
 
diff --git a/utils/qrcode/saveFile.go b/utils/qrcode/saveFile.go
index 4854783..5550b86 100644
--- a/utils/qrcode/saveFile.go
+++ b/utils/qrcode/saveFile.go
@@ -1,4 +1,4 @@
-package qrcode
+package zhios_tool_qrcode
 
 // 生成登录二维码图片
 
diff --git a/utils/qrcode/writeWeb.go b/utils/qrcode/writeWeb.go
index 57e1e92..15c8832 100644
--- a/utils/qrcode/writeWeb.go
+++ b/utils/qrcode/writeWeb.go
@@ -1,4 +1,4 @@
-package qrcode
+package zhios_tool_qrcode
 
 import (
 	"bytes"
diff --git a/utils/rand.go b/utils/rand.go
index 5c52ae3..1a64dfe 100644
--- a/utils/rand.go
+++ b/utils/rand.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	crand "crypto/rand"
diff --git a/utils/rsa.go b/utils/rsa.go
index fb8274a..627f684 100644
--- a/utils/rsa.go
+++ b/utils/rsa.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"bytes"
diff --git a/utils/serialize.go b/utils/serialize.go
index 1ac4d80..1daeaa4 100644
--- a/utils/serialize.go
+++ b/utils/serialize.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"encoding/json"
diff --git a/utils/shuffle.go b/utils/shuffle.go
index 2c845a8..cbb0a32 100644
--- a/utils/shuffle.go
+++ b/utils/shuffle.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"math/rand"
diff --git a/utils/sign_check.go b/utils/sign_check.go
index b7bb5cf..1c05b8d 100644
--- a/utils/sign_check.go
+++ b/utils/sign_check.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_tools.git/utils/logx"
diff --git a/utils/slice.go b/utils/slice.go
index fd86081..03d8099 100644
--- a/utils/slice.go
+++ b/utils/slice.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 // ContainsString is 字符串是否包含在字符串切片里
 func ContainsString(array []string, val string) (index int) {
diff --git a/utils/slice_and_string.go b/utils/slice_and_string.go
index 3ae6946..b284ea4 100644
--- a/utils/slice_and_string.go
+++ b/utils/slice_and_string.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"fmt"
diff --git a/utils/string.go b/utils/string.go
index fcf9043..97fb994 100644
--- a/utils/string.go
+++ b/utils/string.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"fmt"
diff --git a/utils/struct2UrlParams.go b/utils/struct2UrlParams.go
index 7f8ac05..c55a636 100644
--- a/utils/struct2UrlParams.go
+++ b/utils/struct2UrlParams.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import "sort"
 
diff --git a/utils/time.go b/utils/time.go
index 16fb214..0e4538f 100644
--- a/utils/time.go
+++ b/utils/time.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"errors"
diff --git a/utils/translate.go b/utils/translate.go
index cab4d00..df898fa 100644
--- a/utils/translate.go
+++ b/utils/translate.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_tools.git/utils/cache"
diff --git a/utils/trim_html.go b/utils/trim_html.go
index f796f32..cc1aa00 100644
--- a/utils/trim_html.go
+++ b/utils/trim_html.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"regexp"
diff --git a/utils/uuid.go b/utils/uuid.go
index 346b7b2..12ae5c0 100644
--- a/utils/uuid.go
+++ b/utils/uuid.go
@@ -1,4 +1,4 @@
-package utils
+package zhios_tool_utils
 
 import (
 	"fmt"