diff --git a/README.md b/README.md index 9c1807cf..9e4387e7 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ [comment]: <> (go) [![go](https://github.com/dtapps/go-library/actions/workflows/go.yml/badge.svg)](https://github.com/dtapps/go-library/actions/workflows/go.yml) -[![godoc](https://pkg.go.dev/badge/gopkg.in/dtapps/go-library.v2?status.svg)](https://pkg.go.dev/gopkg.in/dtapps/go-library.v2) -[![goproxy.cn](https://goproxy.cn/stats/gopkg.in/dtapps/go-library.v2/badges/download-count.svg)](https://goproxy.cn/stats/gopkg.in/dtapps/go-library.v2) -[![goreportcard.com](https://goreportcard.com/badge/gopkg.in/dtapps/go-library.v2)](https://goreportcard.com/report/gopkg.in/dtapps/go-library.v2) +[![godoc](https://pkg.go.dev/badge/gopkg.in/dtapps/go-library.v3?status.svg)](https://pkg.go.dev/gopkg.in/dtapps/go-library.v3) +[![goproxy.cn](https://goproxy.cn/stats/gopkg.in/dtapps/go-library.v3/badges/download-count.svg)](https://goproxy.cn/stats/gopkg.in/dtapps/go-library.v3) +[![goreportcard.com](https://goreportcard.com/badge/gopkg.in/dtapps/go-library.v3)](https://goreportcard.com/report/gopkg.in/dtapps/go-library.v3) [![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/github.com%2Fdtapps%2Fgo-library) [![Coverage Status](https://coveralls.io/repos/github/dtapps/go-library/badge.svg?branch=master)](https://coveralls.io/github/dtapps/go-library?branch=master) [![Sourcegraph](https://sourcegraph.com/github.com/dtapps/go-library/-/badge.svg)](https://sourcegraph.com/github.com/dtapps/go-library?badge) @@ -19,10 +19,10 @@ #### 安装使用 ```go -go get -v -u gopkg.in/dtapps/go-library.v2 +go get -v -u gopkg.in/dtapps/go-library.v3 import ( - "gopkg.in/dtapps/go-library.v2" + "gopkg.in/dtapps/go-library.v3" ) ``` @@ -34,7 +34,7 @@ import ( ```go import ( - "gopkg.in/dtapps/go-library.v2/utils/gotime" + "gopkg.in/dtapps/go-library.v3/utils/gotime" ) gotime.Current().Now() @@ -53,6 +53,6 @@ gotime.Current().TimestampWithMillisecond() ## 🔑 License -[MIT](https://gopkg.in/dtapps/go-library.v2/blob/master/LICENSE) +[MIT](https://gopkg.in/dtapps/go-library.v3/blob/master/LICENSE) Copyright (c) 2018 茂名聚合科技有限公司 \ No newline at end of file diff --git a/go.mod b/go.mod index 82c88ad6..02aa4b08 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gopkg.in/dtapps/go-library.v2 +module gopkg.in/dtapps/go-library.v3 go 1.17 diff --git a/service/dingdanxia/app.go b/service/dingdanxia/app.go index 6757e65b..79f354f6 100644 --- a/service/dingdanxia/app.go +++ b/service/dingdanxia/app.go @@ -1,7 +1,7 @@ package dingdanxia import ( - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" "net/http" ) diff --git a/service/dingtalk/dingtalk.go b/service/dingtalk/dingtalk.go index dfc39962..c864d704 100644 --- a/service/dingtalk/dingtalk.go +++ b/service/dingtalk/dingtalk.go @@ -6,9 +6,9 @@ import ( "encoding/base64" "encoding/json" "fmt" - "gopkg.in/dtapps/go-library.v2/service/dingtalk/config" - "gopkg.in/dtapps/go-library.v2/service/dingtalk/message" - "gopkg.in/dtapps/go-library.v2/utils/gojson" + "gopkg.in/dtapps/go-library.v3/service/dingtalk/config" + "gopkg.in/dtapps/go-library.v3/service/dingtalk/message" + "gopkg.in/dtapps/go-library.v3/utils/gojson" "io/ioutil" "net/http" "strings" diff --git a/service/dingtalk/dingtalk_test.go b/service/dingtalk/dingtalk_test.go index 6e049181..15edfd08 100644 --- a/service/dingtalk/dingtalk_test.go +++ b/service/dingtalk/dingtalk_test.go @@ -2,7 +2,7 @@ package dingtalk import ( "fmt" - "gopkg.in/dtapps/go-library.v2/service/dingtalk/message" + "gopkg.in/dtapps/go-library.v3/service/dingtalk/message" "testing" ) diff --git a/service/eastiot/app.go b/service/eastiot/app.go index 28e21237..5fc8d458 100644 --- a/service/eastiot/app.go +++ b/service/eastiot/app.go @@ -1,7 +1,7 @@ package eastiot import ( - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" "net/http" "time" ) diff --git a/service/eastiot/sign.go b/service/eastiot/sign.go index 024e4c6a..aa49e270 100644 --- a/service/eastiot/sign.go +++ b/service/eastiot/sign.go @@ -3,7 +3,7 @@ package eastiot import ( "encoding/json" "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gomd5" + "gopkg.in/dtapps/go-library.v3/utils/gomd5" "sort" "strconv" ) diff --git a/service/ejiaofei/app.go b/service/ejiaofei/app.go index a705e828..ca0d9fb1 100644 --- a/service/ejiaofei/app.go +++ b/service/ejiaofei/app.go @@ -2,8 +2,8 @@ package ejiaofei import ( "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" - "gopkg.in/dtapps/go-library.v2/utils/gomd5" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gomd5" "net/http" ) diff --git a/service/ip/app.go b/service/ip/app.go index 5b4faa47..96a3b81e 100644 --- a/service/ip/app.go +++ b/service/ip/app.go @@ -1,9 +1,9 @@ package ip import ( - "gopkg.in/dtapps/go-library.v2/service/ip/ip2region" - v4 "gopkg.in/dtapps/go-library.v2/service/ip/v4" - v6 "gopkg.in/dtapps/go-library.v2/service/ip/v6" + "gopkg.in/dtapps/go-library.v3/service/ip/ip2region" + v4 "gopkg.in/dtapps/go-library.v3/service/ip/v4" + v6 "gopkg.in/dtapps/go-library.v3/service/ip/v6" "os" "strings" ) diff --git a/service/ip/ip2region/ip2region.go b/service/ip/ip2region/ip2region.go index 4bcf4d9a..be5b6c2d 100644 --- a/service/ip/ip2region/ip2region.go +++ b/service/ip/ip2region/ip2region.go @@ -3,7 +3,7 @@ package ip2region import ( _ "embed" "errors" - "gopkg.in/dtapps/go-library.v2/utils/gostring" + "gopkg.in/dtapps/go-library.v3/utils/gostring" "os" "strconv" "strings" diff --git a/service/ip/v4/ipv4.go b/service/ip/v4/ipv4.go index 850bf9b4..7b299b79 100644 --- a/service/ip/v4/ipv4.go +++ b/service/ip/v4/ipv4.go @@ -4,7 +4,7 @@ import ( _ "embed" "encoding/binary" "golang.org/x/text/encoding/simplifiedchinese" - "gopkg.in/dtapps/go-library.v2/utils/gostring" + "gopkg.in/dtapps/go-library.v3/utils/gostring" "net" ) diff --git a/service/ip/v6/ipv6.go b/service/ip/v6/ipv6.go index d793dc23..36f249db 100644 --- a/service/ip/v6/ipv6.go +++ b/service/ip/v6/ipv6.go @@ -3,7 +3,7 @@ package v6 import ( _ "embed" "encoding/binary" - "gopkg.in/dtapps/go-library.v2/utils/gostring" + "gopkg.in/dtapps/go-library.v3/utils/gostring" "math/big" "net" "strings" diff --git a/service/jd/app.go b/service/jd/app.go index 1ee4e928..5570c4d4 100644 --- a/service/jd/app.go +++ b/service/jd/app.go @@ -2,7 +2,7 @@ package jd import ( "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" ) type App struct { diff --git a/service/kashangwl/app.go b/service/kashangwl/app.go index ef1b3593..1b7d16ab 100644 --- a/service/kashangwl/app.go +++ b/service/kashangwl/app.go @@ -2,7 +2,7 @@ package kashangwl import ( "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" "time" ) diff --git a/service/kashangwl/sign.go b/service/kashangwl/sign.go index aed95e13..9ced8f41 100644 --- a/service/kashangwl/sign.go +++ b/service/kashangwl/sign.go @@ -5,7 +5,7 @@ import ( "crypto/md5" "encoding/hex" "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/goparams" + "gopkg.in/dtapps/go-library.v3/utils/goparams" "io" "net/url" "sort" diff --git a/service/meituan/app.go b/service/meituan/app.go index 09b73fa9..9304c158 100644 --- a/service/meituan/app.go +++ b/service/meituan/app.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" "net/http" ) diff --git a/service/meituan/order_list.go b/service/meituan/order_list.go index 122e02b0..576d4792 100644 --- a/service/meituan/order_list.go +++ b/service/meituan/order_list.go @@ -2,7 +2,7 @@ package meituan import ( "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/gotime" + "gopkg.in/dtapps/go-library.v3/utils/gotime" ) // OrderList 请求参数 diff --git a/service/pinduoduo/app.go b/service/pinduoduo/app.go index 3431f512..0e9530c9 100644 --- a/service/pinduoduo/app.go +++ b/service/pinduoduo/app.go @@ -3,8 +3,8 @@ package pinduoduo import ( "encoding/json" "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" - "gopkg.in/dtapps/go-library.v2/utils/gostring" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gostring" "regexp" "strconv" "strings" diff --git a/service/taobao/app.go b/service/taobao/app.go index 8a3d3598..104d6934 100644 --- a/service/taobao/app.go +++ b/service/taobao/app.go @@ -3,8 +3,8 @@ package taobao import ( "encoding/json" "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" - "gopkg.in/dtapps/go-library.v2/utils/gostring" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gostring" "regexp" "strconv" ) diff --git a/service/tianyancha/app.go b/service/tianyancha/app.go index b09eda92..2e120c40 100644 --- a/service/tianyancha/app.go +++ b/service/tianyancha/app.go @@ -2,7 +2,7 @@ package tianyancha import ( "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" "net/http" ) diff --git a/service/wechatmp/share.go b/service/wechatmp/share.go index 072b57ab..e2e40eb4 100644 --- a/service/wechatmp/share.go +++ b/service/wechatmp/share.go @@ -3,7 +3,7 @@ package wechatmp import ( "crypto/sha1" "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gorandom" + "gopkg.in/dtapps/go-library.v3/utils/gorandom" "io" "time" ) diff --git a/service/wechatpayapiv3/app.go b/service/wechatpayapiv3/app.go index 80ab09f2..6043a5ef 100644 --- a/service/wechatpayapiv3/app.go +++ b/service/wechatpayapiv3/app.go @@ -3,7 +3,7 @@ package wechatpayapiv3 import ( "bytes" "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/gorequest" + "gopkg.in/dtapps/go-library.v3/utils/gorequest" "io/ioutil" "net/http" ) diff --git a/service/wechatpayapiv3/pay.jsapi.go b/service/wechatpayapiv3/pay.jsapi.go index 7a881b55..72fb2a9a 100644 --- a/service/wechatpayapiv3/pay.jsapi.go +++ b/service/wechatpayapiv3/pay.jsapi.go @@ -2,7 +2,7 @@ package wechatpayapiv3 import ( "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gorandom" + "gopkg.in/dtapps/go-library.v3/utils/gorandom" "time" ) diff --git a/service/wechatpayapiv3/sign.go b/service/wechatpayapiv3/sign.go index 2018f056..63171551 100644 --- a/service/wechatpayapiv3/sign.go +++ b/service/wechatpayapiv3/sign.go @@ -13,7 +13,7 @@ import ( "encoding/pem" "errors" "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gorandom" + "gopkg.in/dtapps/go-library.v3/utils/gorandom" "net/url" "time" ) diff --git a/service/wechatqy/app.go b/service/wechatqy/app.go index da012f69..c971a384 100644 --- a/service/wechatqy/app.go +++ b/service/wechatqy/app.go @@ -2,7 +2,7 @@ package wechatqy import ( "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" ) type App struct { diff --git a/service/wechatunion/app.go b/service/wechatunion/app.go index 9980c862..1c1b4da3 100644 --- a/service/wechatunion/app.go +++ b/service/wechatunion/app.go @@ -2,7 +2,7 @@ package wechatunion import ( "encoding/json" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" "net/http" ) diff --git a/service/wikeyun/app.go b/service/wikeyun/app.go index de5e9f47..29bd03be 100644 --- a/service/wikeyun/app.go +++ b/service/wikeyun/app.go @@ -2,7 +2,7 @@ package wikeyun import ( "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gohttp" + "gopkg.in/dtapps/go-library.v3/utils/gohttp" ) type App struct { diff --git a/utils/gohttp/gohttp.go b/utils/gohttp/gohttp.go index 1d44c0c8..105fb78f 100644 --- a/utils/gohttp/gohttp.go +++ b/utils/gohttp/gohttp.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gorequest" + "gopkg.in/dtapps/go-library.v3/utils/gorequest" "io/ioutil" "net/http" "net/url" diff --git a/utils/gophp/gophp.go b/utils/gophp/gophp.go index f594d0d9..ed334c11 100644 --- a/utils/gophp/gophp.go +++ b/utils/gophp/gophp.go @@ -1,6 +1,6 @@ package gophp -import "gopkg.in/dtapps/go-library.v2/utils/gophp/serialize" +import "gopkg.in/dtapps/go-library.v3/utils/gophp/serialize" // Serialize 序列 func Serialize(value interface{}) ([]byte, error) { diff --git a/utils/gophp/serialize/serialize.go b/utils/gophp/serialize/serialize.go index ec7b26b0..711e4ecd 100644 --- a/utils/gophp/serialize/serialize.go +++ b/utils/gophp/serialize/serialize.go @@ -3,8 +3,8 @@ package serialize import ( "bytes" "fmt" - "gopkg.in/dtapps/go-library.v2/utils/goless" - "gopkg.in/dtapps/go-library.v2/utils/gostring" + "gopkg.in/dtapps/go-library.v3/utils/goless" + "gopkg.in/dtapps/go-library.v3/utils/gostring" "reflect" "sort" ) diff --git a/utils/gophp/serialize/unserialize.go b/utils/gophp/serialize/unserialize.go index 8f454345..b47a1cee 100644 --- a/utils/gophp/serialize/unserialize.go +++ b/utils/gophp/serialize/unserialize.go @@ -3,7 +3,7 @@ package serialize import ( "bytes" "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gostring" + "gopkg.in/dtapps/go-library.v3/utils/gostring" "strconv" ) diff --git a/utils/gouuid/gouuid_test.go b/utils/gouuid/gouuid_test.go index 2d425d75..50cc2d98 100644 --- a/utils/gouuid/gouuid_test.go +++ b/utils/gouuid/gouuid_test.go @@ -2,7 +2,7 @@ package gouuid_test import ( "fmt" - "gopkg.in/dtapps/go-library.v2/utils/gouuid" + "gopkg.in/dtapps/go-library.v3/utils/gouuid" "testing" )