From 43850b027af175134f8d156cf68044737bb7d449 Mon Sep 17 00:00:00 2001 From: andeya Date: Sun, 26 Jun 2022 23:59:01 +0800 Subject: [PATCH] fix: fix imports --- examples/age/client.go | 2 ++ examples/age/server.go | 2 ++ examples/async/client.go | 2 ++ examples/async/server.go | 2 ++ examples/bench/client.go | 1 + examples/bench/mclient.go | 1 + examples/bench/server.go | 1 + examples/bytes/client.go | 2 ++ examples/bytes/server.go | 2 ++ examples/config/server.go | 1 + examples/group/client.go | 2 ++ examples/group/server.go | 2 ++ examples/kcp/client.go | 2 ++ examples/kcp/server.go | 2 ++ examples/plugin-tps/tps.go | 2 ++ examples/proxy_and_seq/server.go | 2 ++ examples/quic/client.go | 2 ++ examples/quic/server.go | 2 ++ examples/route_func/client.go | 2 ++ examples/route_func/server.go | 2 ++ examples/simple/client.go | 2 ++ examples/simple/server.go | 2 ++ go.mod | 8 ++--- go.sum | 35 ++++++++++++++------ mixer/evio/bench/client.go | 1 + mixer/evio/bench/server.go | 1 + mixer/evio/evio.go | 1 + mixer/multiclient/multiclient.go | 1 + mixer/websocket/client.go | 1 + mixer/websocket/handshake_auth.go | 1 + mixer/websocket/jsonSubProto/jsonSubProto.go | 1 + mixer/websocket/pbSubProto/pbSubProto.go | 1 + mixer/websocket/proto.go | 1 + mixer/websocket/server.go | 1 + plugin/auth/auth.go | 1 + plugin/binder/binder.go | 1 + plugin/heartbeat/ping.go | 1 + plugin/heartbeat/pong.go | 1 + plugin/ignorecase/ignorecase.go | 2 ++ plugin/overloader/overloader.go | 2 ++ plugin/proxy/proxy.go | 1 + plugin/secure/secure.go | 1 + proto/httproto/httproto.go | 1 + proto/jsonproto/jsonproto.go | 1 + proto/pbproto/pbproto.go | 1 + proto/rawproto/rawproto.go | 1 + proto/thriftproto/binary_proto.go | 1 + proto/thriftproto/struct_proto.go | 1 + utils/bytesconv_32.go | 1 + utils/bytesconv_64.go | 1 + utils/color/colorable_others.go | 1 + utils/color/isatty_appengine.go | 1 + utils/color/isatty_bsd.go | 1 + utils/color/isatty_linux.go | 4 +-- utils/color/isatty_solaris.go | 4 +-- utils/color/isatty_windows.go | 4 +-- 56 files changed, 106 insertions(+), 20 deletions(-) diff --git a/examples/age/client.go b/examples/age/client.go index 024ae030..aff90242 100644 --- a/examples/age/client.go +++ b/examples/age/client.go @@ -3,6 +3,8 @@ package main import ( "context" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/age/server.go b/examples/age/server.go index 89d7af44..e8da4109 100644 --- a/examples/age/server.go +++ b/examples/age/server.go @@ -3,6 +3,8 @@ package main import ( "context" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/async/client.go b/examples/async/client.go index 1a246a4a..6896fc59 100644 --- a/examples/async/client.go +++ b/examples/async/client.go @@ -3,6 +3,8 @@ package main import ( "fmt" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/async/server.go b/examples/async/server.go index 89a30574..a435aafe 100644 --- a/examples/async/server.go +++ b/examples/async/server.go @@ -2,6 +2,8 @@ package main import ( "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/bench/client.go b/examples/bench/client.go index 5e838fc8..41c87e00 100644 --- a/examples/bench/client.go +++ b/examples/bench/client.go @@ -9,6 +9,7 @@ import ( "sync/atomic" "time" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/examples/bench/msg" "github.com/montanaflynn/stats" ) diff --git a/examples/bench/mclient.go b/examples/bench/mclient.go index c19e9134..ae1bcb2a 100644 --- a/examples/bench/mclient.go +++ b/examples/bench/mclient.go @@ -8,6 +8,7 @@ import ( "sync/atomic" "time" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/examples/bench/msg" proto "github.com/gogo/protobuf/proto" "github.com/montanaflynn/stats" diff --git a/examples/bench/server.go b/examples/bench/server.go index 65a56c0c..05bb3a3d 100644 --- a/examples/bench/server.go +++ b/examples/bench/server.go @@ -8,6 +8,7 @@ import ( "runtime" "time" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/examples/bench/msg" ) diff --git a/examples/bytes/client.go b/examples/bytes/client.go index 97004d38..c65a74c6 100644 --- a/examples/bytes/client.go +++ b/examples/bytes/client.go @@ -2,6 +2,8 @@ package main import ( "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/bytes/server.go b/examples/bytes/server.go index a8c7731a..eda0cdb3 100644 --- a/examples/bytes/server.go +++ b/examples/bytes/server.go @@ -2,6 +2,8 @@ package main import ( "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/config/server.go b/examples/config/server.go index a8aaf408..b4bd7aa0 100644 --- a/examples/config/server.go +++ b/examples/config/server.go @@ -2,6 +2,7 @@ package main import ( "github.com/andeya/cfgo" + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/group/client.go b/examples/group/client.go index 5f421aab..e29b345b 100644 --- a/examples/group/client.go +++ b/examples/group/client.go @@ -1,5 +1,7 @@ package main +import "github.com/andeya/erpc/v7" + //go:generate go build $GOFILE func main() { diff --git a/examples/group/server.go b/examples/group/server.go index 536a4b6b..a3d27e1f 100644 --- a/examples/group/server.go +++ b/examples/group/server.go @@ -3,6 +3,8 @@ package main import ( "fmt" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/kcp/client.go b/examples/kcp/client.go index 5853b732..3cd9154f 100644 --- a/examples/kcp/client.go +++ b/examples/kcp/client.go @@ -2,6 +2,8 @@ package main import ( "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/kcp/server.go b/examples/kcp/server.go index 2b968fde..63853e0a 100644 --- a/examples/kcp/server.go +++ b/examples/kcp/server.go @@ -3,6 +3,8 @@ package main import ( "fmt" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/plugin-tps/tps.go b/examples/plugin-tps/tps.go index 37988367..b8af5c8a 100644 --- a/examples/plugin-tps/tps.go +++ b/examples/plugin-tps/tps.go @@ -6,6 +6,8 @@ import ( "sync" "sync/atomic" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/proxy_and_seq/server.go b/examples/proxy_and_seq/server.go index e0267c76..9841f01c 100644 --- a/examples/proxy_and_seq/server.go +++ b/examples/proxy_and_seq/server.go @@ -1,5 +1,7 @@ package main +import "github.com/andeya/erpc/v7" + //go:generate go build $GOFILE func main() { diff --git a/examples/quic/client.go b/examples/quic/client.go index d16cb967..251fcf59 100644 --- a/examples/quic/client.go +++ b/examples/quic/client.go @@ -2,6 +2,8 @@ package main import ( "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/quic/server.go b/examples/quic/server.go index e98d55f7..bec5ddfb 100644 --- a/examples/quic/server.go +++ b/examples/quic/server.go @@ -3,6 +3,8 @@ package main import ( "fmt" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/route_func/client.go b/examples/route_func/client.go index 22f800a1..817883ee 100644 --- a/examples/route_func/client.go +++ b/examples/route_func/client.go @@ -1,5 +1,7 @@ package main +import "github.com/andeya/erpc/v7" + //go:generate go build $GOFILE func main() { diff --git a/examples/route_func/server.go b/examples/route_func/server.go index 42d92d4f..6a3c6cd1 100644 --- a/examples/route_func/server.go +++ b/examples/route_func/server.go @@ -3,6 +3,8 @@ package main import ( "fmt" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/simple/client.go b/examples/simple/client.go index e6d869c6..08968462 100644 --- a/examples/simple/client.go +++ b/examples/simple/client.go @@ -2,6 +2,8 @@ package main import ( "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/examples/simple/server.go b/examples/simple/server.go index 6e3541aa..b2f0af8d 100644 --- a/examples/simple/server.go +++ b/examples/simple/server.go @@ -3,6 +3,8 @@ package main import ( "fmt" "time" + + "github.com/andeya/erpc/v7" ) //go:generate go build $GOFILE diff --git a/go.mod b/go.mod index 5a814195..1716600a 100644 --- a/go.mod +++ b/go.mod @@ -6,13 +6,13 @@ require ( git.apache.org/thrift.git v0.13.0 github.com/andeya/cfgo v0.0.0-20220626152948-7980c5d761c8 github.com/andeya/goutil v0.0.0-20220626152529-9b7868da7b6d - github.com/gogo/protobuf v1.2.1 + github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.2 github.com/lucas-clemente/quic-go v0.26.0 github.com/montanaflynn/stats v0.5.0 github.com/stretchr/testify v1.7.5 - github.com/tidwall/evio v1.0.7 - github.com/tidwall/gjson v1.14.0 + github.com/tidwall/evio v1.0.8 + github.com/tidwall/gjson v1.14.1 github.com/xtaci/kcp-go/v5 v5.5.12 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 ) @@ -23,7 +23,7 @@ require ( github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect github.com/henrylee2cn/ameda v1.4.11-0.20220626150338-af180105bd0f // indirect - github.com/kavu/go_reuseport v1.4.0 // indirect + github.com/kavu/go_reuseport v1.5.0 // indirect github.com/klauspost/cpuid v1.2.2 // indirect github.com/klauspost/reedsolomon v1.9.3 // indirect github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect diff --git a/go.sum b/go.sum index f4ca7844..67773470 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -47,16 +47,26 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -80,9 +90,9 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/kavu/go_reuseport v1.4.0 h1:YIp/96RZ3sJfn0LN+FFkkXIq3H3dfVOdRUtNejhDcxc= -github.com/kavu/go_reuseport v1.4.0/go.mod h1:CG8Ee7ceMFSMnx/xr25Vm0qXaj2Z4i5PWoUx+JZ5/CU= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kavu/go_reuseport v1.5.0 h1:UNuiY2OblcqAtVDE8Gsg1kZz8zbBWg907sP1ceBV+bk= +github.com/kavu/go_reuseport v1.5.0/go.mod h1:CG8Ee7ceMFSMnx/xr25Vm0qXaj2Z4i5PWoUx+JZ5/CU= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/cpuid v1.2.2 h1:1xAgYebNnsb9LKCdLOvFWtAxGU/33mjJtyOVbmUa0Us= github.com/klauspost/cpuid v1.2.2/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= @@ -174,10 +184,10 @@ github.com/templexxx/cpu v0.0.1 h1:hY4WdLOgKdc8y13EYklu9OUTXik80BkxHoWvTO6MQQY= github.com/templexxx/cpu v0.0.1/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk= github.com/templexxx/xorsimd v0.4.1 h1:iUZcywbOYDRAZUasAs2eSCUW8eobuZDy0I9FJiORkVg= github.com/templexxx/xorsimd v0.4.1/go.mod h1:W+ffZz8jJMH2SXwuKu9WhygqBMbFnp14G2fqEr8qaNo= -github.com/tidwall/evio v1.0.7 h1:vczkMaNN5Ekj0bsbT/3gCnLyOaKsecxrJFlbYFOsv0Y= -github.com/tidwall/evio v1.0.7/go.mod h1:cYtY49LddNrlpsOmW7qJnqM8B2gOjrFrzT8+Fnb/GKs= -github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w= -github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/evio v1.0.8 h1:+M7lh83rL4KwEObDGtXP3J1wE5utH80LeaAhrKCGVfE= +github.com/tidwall/evio v1.0.8/go.mod h1:MJhRp4iVVqx/n/5mJk77oKmSABVhC7yYykcJiKaFYYw= +github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo= +github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= @@ -190,6 +200,7 @@ github.com/xtaci/kcp-go/v5 v5.5.12 h1:iALGyvti/oBbl1TbVoUpHEUHCorDEb3tEKl1CPY3KX github.com/xtaci/kcp-go/v5 v5.5.12/go.mod h1:H0T/EJ+lPNytnFYsKLH0JHUtiwZjG3KXlTM6c+Q4YUo= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= @@ -207,6 +218,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -222,6 +234,7 @@ golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -238,6 +251,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -270,7 +284,6 @@ golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -278,7 +291,9 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/mixer/evio/bench/client.go b/mixer/evio/bench/client.go index ac51d6d1..d1c2fd02 100644 --- a/mixer/evio/bench/client.go +++ b/mixer/evio/bench/client.go @@ -9,6 +9,7 @@ import ( "sync/atomic" "time" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/examples/bench/msg" "github.com/montanaflynn/stats" ) diff --git a/mixer/evio/bench/server.go b/mixer/evio/bench/server.go index c712076f..503fa9c4 100644 --- a/mixer/evio/bench/server.go +++ b/mixer/evio/bench/server.go @@ -8,6 +8,7 @@ import ( "runtime" "time" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/examples/bench/msg" "github.com/andeya/erpc/v7/mixer/evio" ) diff --git a/mixer/evio/evio.go b/mixer/evio/evio.go index a101e273..98dd86a5 100644 --- a/mixer/evio/evio.go +++ b/mixer/evio/evio.go @@ -9,6 +9,7 @@ import ( "sync" "time" + "github.com/andeya/erpc/v7" "github.com/tidwall/evio" ) diff --git a/mixer/multiclient/multiclient.go b/mixer/multiclient/multiclient.go index cbde34cb..18577550 100644 --- a/mixer/multiclient/multiclient.go +++ b/mixer/multiclient/multiclient.go @@ -18,6 +18,7 @@ package multiclient import ( "time" + "github.com/andeya/erpc/v7" "github.com/andeya/goutil/pool" ) diff --git a/mixer/websocket/client.go b/mixer/websocket/client.go index 58ff4fef..bc525b98 100644 --- a/mixer/websocket/client.go +++ b/mixer/websocket/client.go @@ -22,6 +22,7 @@ import ( "path" "strings" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/mixer/websocket/jsonSubProto" "github.com/andeya/erpc/v7/mixer/websocket/pbSubProto" ws "github.com/andeya/erpc/v7/mixer/websocket/websocket" diff --git a/mixer/websocket/handshake_auth.go b/mixer/websocket/handshake_auth.go index 1a92419c..f4b4db85 100644 --- a/mixer/websocket/handshake_auth.go +++ b/mixer/websocket/handshake_auth.go @@ -16,6 +16,7 @@ package websocket import ( "net/http" + "github.com/andeya/erpc/v7" ws "github.com/andeya/erpc/v7/mixer/websocket/websocket" ) diff --git a/mixer/websocket/jsonSubProto/jsonSubProto.go b/mixer/websocket/jsonSubProto/jsonSubProto.go index c53ef990..66b54a59 100644 --- a/mixer/websocket/jsonSubProto/jsonSubProto.go +++ b/mixer/websocket/jsonSubProto/jsonSubProto.go @@ -8,6 +8,7 @@ import ( "io/ioutil" "sync" + "github.com/andeya/erpc/v7" "github.com/andeya/goutil" "github.com/tidwall/gjson" ) diff --git a/mixer/websocket/pbSubProto/pbSubProto.go b/mixer/websocket/pbSubProto/pbSubProto.go index b31e798c..e5348be9 100644 --- a/mixer/websocket/pbSubProto/pbSubProto.go +++ b/mixer/websocket/pbSubProto/pbSubProto.go @@ -5,6 +5,7 @@ import ( "io/ioutil" "sync" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/codec" "github.com/andeya/erpc/v7/mixer/websocket/pbSubProto/pb" ) diff --git a/mixer/websocket/proto.go b/mixer/websocket/proto.go index fe4ca142..580d4619 100644 --- a/mixer/websocket/proto.go +++ b/mixer/websocket/proto.go @@ -17,6 +17,7 @@ package websocket import ( "bytes" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/mixer/websocket/jsonSubProto" ws "github.com/andeya/erpc/v7/mixer/websocket/websocket" "github.com/andeya/erpc/v7/socket" diff --git a/mixer/websocket/server.go b/mixer/websocket/server.go index 26de9ae4..2c730e24 100644 --- a/mixer/websocket/server.go +++ b/mixer/websocket/server.go @@ -21,6 +21,7 @@ import ( "net/http" "net/url" + "github.com/andeya/erpc/v7" "github.com/andeya/goutil" "github.com/andeya/erpc/v7/mixer/websocket/jsonSubProto" diff --git a/plugin/auth/auth.go b/plugin/auth/auth.go index 7d2ea1cf..38bd05e4 100644 --- a/plugin/auth/auth.go +++ b/plugin/auth/auth.go @@ -20,6 +20,7 @@ import ( "net" "sync/atomic" + "github.com/andeya/erpc/v7" "github.com/andeya/goutil" ) diff --git a/plugin/binder/binder.go b/plugin/binder/binder.go index efe83e48..5da99d2c 100644 --- a/plugin/binder/binder.go +++ b/plugin/binder/binder.go @@ -24,6 +24,7 @@ import ( "strconv" "strings" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/utils" "github.com/andeya/goutil" ) diff --git a/plugin/heartbeat/ping.go b/plugin/heartbeat/ping.go index 2720e1cd..1e25ce71 100644 --- a/plugin/heartbeat/ping.go +++ b/plugin/heartbeat/ping.go @@ -21,6 +21,7 @@ import ( "sync" "time" + "github.com/andeya/erpc/v7" "github.com/andeya/goutil/coarsetime" ) diff --git a/plugin/heartbeat/pong.go b/plugin/heartbeat/pong.go index 6d870e6d..6a00b588 100644 --- a/plugin/heartbeat/pong.go +++ b/plugin/heartbeat/pong.go @@ -18,6 +18,7 @@ import ( "strconv" "time" + "github.com/andeya/erpc/v7" "github.com/andeya/goutil" "github.com/andeya/goutil/coarsetime" diff --git a/plugin/ignorecase/ignorecase.go b/plugin/ignorecase/ignorecase.go index fb6d1d7f..79fd66b9 100644 --- a/plugin/ignorecase/ignorecase.go +++ b/plugin/ignorecase/ignorecase.go @@ -3,6 +3,8 @@ package ignorecase import ( "strings" + + "github.com/andeya/erpc/v7" ) // NewIgnoreCase Returns a ignoreCase plugin. diff --git a/plugin/overloader/overloader.go b/plugin/overloader/overloader.go index abfc5758..8b9d9e21 100644 --- a/plugin/overloader/overloader.go +++ b/plugin/overloader/overloader.go @@ -5,6 +5,8 @@ import ( "fmt" "sync" "time" + + "github.com/andeya/erpc/v7" ) type ( diff --git a/plugin/proxy/proxy.go b/plugin/proxy/proxy.go index 8c7a9e71..c1c2abd8 100644 --- a/plugin/proxy/proxy.go +++ b/plugin/proxy/proxy.go @@ -23,6 +23,7 @@ import ( "strings" "sync" + "github.com/andeya/erpc/v7" "github.com/andeya/goutil" ) diff --git a/plugin/secure/secure.go b/plugin/secure/secure.go index 0c779798..34223c0a 100644 --- a/plugin/secure/secure.go +++ b/plugin/secure/secure.go @@ -19,6 +19,7 @@ import ( "crypto/aes" "fmt" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/utils" "github.com/andeya/goutil" ) diff --git a/proto/httproto/httproto.go b/proto/httproto/httproto.go index 36d2db43..a40f6594 100644 --- a/proto/httproto/httproto.go +++ b/proto/httproto/httproto.go @@ -26,6 +26,7 @@ import ( "strings" "sync" + "github.com/andeya/erpc/v7" "github.com/andeya/goutil" "github.com/andeya/erpc/v7/codec" diff --git a/proto/jsonproto/jsonproto.go b/proto/jsonproto/jsonproto.go index 41a5ae7a..2552ef14 100644 --- a/proto/jsonproto/jsonproto.go +++ b/proto/jsonproto/jsonproto.go @@ -23,6 +23,7 @@ import ( "strconv" "sync" + "github.com/andeya/erpc/v7" "github.com/tidwall/gjson" "github.com/andeya/erpc/v7/utils" diff --git a/proto/pbproto/pbproto.go b/proto/pbproto/pbproto.go index 10ddb597..203ad35b 100644 --- a/proto/pbproto/pbproto.go +++ b/proto/pbproto/pbproto.go @@ -21,6 +21,7 @@ import ( "io" "sync" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/codec" "github.com/andeya/erpc/v7/proto/pbproto/pb" "github.com/andeya/erpc/v7/utils" diff --git a/proto/rawproto/rawproto.go b/proto/rawproto/rawproto.go index 841ed458..b03df4dc 100644 --- a/proto/rawproto/rawproto.go +++ b/proto/rawproto/rawproto.go @@ -1,6 +1,7 @@ package rawproto import ( + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/socket" ) diff --git a/proto/thriftproto/binary_proto.go b/proto/thriftproto/binary_proto.go index ae3392b2..2bb5ebf1 100644 --- a/proto/thriftproto/binary_proto.go +++ b/proto/thriftproto/binary_proto.go @@ -5,6 +5,7 @@ import ( "sync" "git.apache.org/thrift.git/lib/go/thrift" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/codec" "github.com/andeya/erpc/v7/utils" "github.com/andeya/goutil" diff --git a/proto/thriftproto/struct_proto.go b/proto/thriftproto/struct_proto.go index bfe26673..4e266867 100644 --- a/proto/thriftproto/struct_proto.go +++ b/proto/thriftproto/struct_proto.go @@ -5,6 +5,7 @@ import ( "fmt" "git.apache.org/thrift.git/lib/go/thrift" + "github.com/andeya/erpc/v7" "github.com/andeya/erpc/v7/codec" "github.com/andeya/erpc/v7/utils" "github.com/andeya/goutil" diff --git a/utils/bytesconv_32.go b/utils/bytesconv_32.go index 5c76ccd3..8d0d376b 100644 --- a/utils/bytesconv_32.go +++ b/utils/bytesconv_32.go @@ -1,3 +1,4 @@ +//go:build !amd64 && !arm64 && !ppc64 // +build !amd64,!arm64,!ppc64 package utils diff --git a/utils/bytesconv_64.go b/utils/bytesconv_64.go index 757243c2..797ccbc6 100644 --- a/utils/bytesconv_64.go +++ b/utils/bytesconv_64.go @@ -1,3 +1,4 @@ +//go:build amd64 || arm64 || ppc64 // +build amd64 arm64 ppc64 package utils diff --git a/utils/color/colorable_others.go b/utils/color/colorable_others.go index ad6293e8..c1b654e1 100644 --- a/utils/color/colorable_others.go +++ b/utils/color/colorable_others.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package color diff --git a/utils/color/isatty_appengine.go b/utils/color/isatty_appengine.go index 30f7755d..61d0e8ae 100644 --- a/utils/color/isatty_appengine.go +++ b/utils/color/isatty_appengine.go @@ -1,3 +1,4 @@ +//go:build appengine // +build appengine package color diff --git a/utils/color/isatty_bsd.go b/utils/color/isatty_bsd.go index c304c415..bdc0c281 100644 --- a/utils/color/isatty_bsd.go +++ b/utils/color/isatty_bsd.go @@ -1,3 +1,4 @@ +//go:build (darwin || freebsd || openbsd || netbsd) && !appengine // +build darwin freebsd openbsd netbsd // +build !appengine diff --git a/utils/color/isatty_linux.go b/utils/color/isatty_linux.go index 42507214..6267ce9c 100644 --- a/utils/color/isatty_linux.go +++ b/utils/color/isatty_linux.go @@ -1,5 +1,5 @@ -// +build linux -// +build !appengine +//go:build linux && !appengine +// +build linux,!appengine package color diff --git a/utils/color/isatty_solaris.go b/utils/color/isatty_solaris.go index 3064b733..ddb7fe2b 100644 --- a/utils/color/isatty_solaris.go +++ b/utils/color/isatty_solaris.go @@ -1,5 +1,5 @@ -// +build solaris -// +build !appengine +//go:build solaris && !appengine +// +build solaris,!appengine package color diff --git a/utils/color/isatty_windows.go b/utils/color/isatty_windows.go index 334f09f3..1268bc7b 100644 --- a/utils/color/isatty_windows.go +++ b/utils/color/isatty_windows.go @@ -1,5 +1,5 @@ -// +build windows -// +build !appengine +//go:build windows && !appengine +// +build windows,!appengine package color