Skip to content

Commit ee007d3

Browse files
authored
Merge pull request smallnest#869 from bububa/master
修复一些dependencies问题
2 parents c68df57 + c735c4f commit ee007d3

File tree

10 files changed

+142
-86
lines changed

10 files changed

+142
-86
lines changed

clientplugin/req_rate_limiting_redis.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"time"
66

7-
"github.com/go-redis/redis/v8"
8-
"github.com/go-redis/redis_rate/v9"
7+
"github.com/go-redis/redis_rate/v10"
8+
"github.com/redis/go-redis/v9"
99
"github.com/smallnest/rpcx/client"
1010
"github.com/smallnest/rpcx/server"
1111
)

go.mod

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ toolchain go1.22.1
66

77
require (
88
github.com/akutz/memconn v0.1.0
9-
github.com/alitto/pond v1.8.3
9+
github.com/alitto/pond v1.9.1
1010
github.com/apache/thrift v0.20.0
1111
github.com/edwingeng/doublejump v1.0.1
12-
github.com/fatih/color v1.16.0
12+
github.com/fatih/color v1.17.0
1313
github.com/go-echarts/go-echarts/v2 v2.3.3
1414
github.com/go-ping/ping v1.1.0
15-
github.com/go-redis/redis/v8 v8.11.5
16-
github.com/go-redis/redis_rate/v9 v9.1.2
15+
github.com/go-redis/redis_rate/v10 v10.0.1
1716
github.com/godzie44/go-uring v0.0.0-20220926161041-69611e8b13d5
1817
github.com/gogo/protobuf v1.3.2
1918
github.com/golang/snappy v0.0.4
@@ -25,27 +24,27 @@ require (
2524
github.com/julienschmidt/httprouter v1.3.0
2625
github.com/kavu/go_reuseport v1.5.0
2726
github.com/kr/pretty v0.2.0
28-
github.com/quic-go/quic-go v0.43.1
27+
github.com/quic-go/quic-go v0.45.2
2928
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
29+
github.com/redis/go-redis/v9 v9.6.1
3030
github.com/rpcxio/libkv v0.5.1
3131
github.com/rs/cors v1.11.0
3232
github.com/rubyist/circuitbreaker v2.2.1+incompatible
3333
github.com/smallnest/quick v0.2.0
3434
github.com/smallnest/statsview v1.0.1
3535
github.com/soheilhy/cmux v0.1.5
36-
github.com/stretchr/testify v1.8.4
37-
github.com/tinylib/msgp v1.1.9
36+
github.com/stretchr/testify v1.9.0
37+
github.com/tinylib/msgp v1.2.0
3838
github.com/twpayne/go-jsonstruct/v3 v3.0.0
3939
github.com/valyala/fastrand v1.1.0
40-
github.com/vmihailenco/msgpack/v5 v5.3.5
40+
github.com/vmihailenco/msgpack/v5 v5.4.1
4141
github.com/xtaci/kcp-go v5.4.20+incompatible
42-
golang.org/x/net v0.25.0
42+
golang.org/x/net v0.27.0
4343
golang.org/x/sync v0.7.0
44-
google.golang.org/protobuf v1.34.1
44+
google.golang.org/protobuf v1.34.2
4545
)
4646

4747
require (
48-
github.com/StackExchange/wmi v1.2.1 // indirect
4948
github.com/cenk/backoff v2.2.1+incompatible // indirect
5049
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
5150
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -57,34 +56,41 @@ require (
5756
github.com/fatih/structtag v1.2.0 // indirect
5857
github.com/fsnotify/fsnotify v1.6.0 // indirect
5958
github.com/go-ole/go-ole v1.3.0 // indirect
59+
github.com/go-redis/redis/v8 v8.11.5 // indirect
6060
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
61-
github.com/google/pprof v0.0.0-20240430035430-e4905b036c4e // indirect
61+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
6262
github.com/google/uuid v1.6.0 // indirect
6363
github.com/hashicorp/errwrap v1.1.0 // indirect
64-
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
65-
github.com/klauspost/reedsolomon v1.12.1 // indirect
64+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
65+
github.com/klauspost/reedsolomon v1.12.3 // indirect
6666
github.com/kr/text v0.1.0 // indirect
6767
github.com/libp2p/go-sockaddr v0.2.0 // indirect
68+
github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
6869
github.com/mattn/go-colorable v0.1.13 // indirect
6970
github.com/mattn/go-isatty v0.0.20 // indirect
70-
github.com/miekg/dns v1.1.59 // indirect
71-
github.com/onsi/ginkgo/v2 v2.17.2 // indirect
71+
github.com/miekg/dns v1.1.61 // indirect
72+
github.com/onsi/ginkgo/v2 v2.19.1 // indirect
7273
github.com/peterbourgon/g2s v0.0.0-20140925154142-ec76db4c1ac1 // indirect
73-
github.com/philhofer/fwd v1.1.2 // indirect
74+
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
7475
github.com/pkg/errors v0.9.1 // indirect
7576
github.com/pmezard/go-difflib v1.0.0 // indirect
76-
github.com/shirou/gopsutil/v3 v3.20.10 // indirect
77+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
78+
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
79+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
7780
github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
7881
github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
7982
github.com/tjfoc/gmsm v1.4.1 // indirect
83+
github.com/tklauser/go-sysconf v0.3.14 // indirect
84+
github.com/tklauser/numcpus v0.8.0 // indirect
8085
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
8186
github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
87+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
8288
go.uber.org/mock v0.4.0 // indirect
83-
golang.org/x/crypto v0.23.0 // indirect
84-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
85-
golang.org/x/mod v0.17.0 // indirect
86-
golang.org/x/sys v0.20.0 // indirect
87-
golang.org/x/text v0.15.0 // indirect
88-
golang.org/x/tools v0.21.0 // indirect
89+
golang.org/x/crypto v0.25.0 // indirect
90+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
91+
golang.org/x/mod v0.19.0 // indirect
92+
golang.org/x/sys v0.22.0 // indirect
93+
golang.org/x/text v0.16.0 // indirect
94+
golang.org/x/tools v0.23.0 // indirect
8995
gopkg.in/yaml.v3 v3.0.1 // indirect
9096
)

0 commit comments

Comments
 (0)