Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add support for go-redis/v8 #507

Merged
merged 26 commits into from
Oct 26, 2022
Merged

feat: add support for go-redis/v8 #507

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
13c87b5
hook
Oct 14, 2022
0556453
redisgo
Oct 18, 2022
d532d08
修复bug
Oct 21, 2022
6f29d44
改造config
Oct 21, 2022
ab184c7
instance
Oct 21, 2022
9dfc8eb
取消traceid的设置
Oct 21, 2022
f05dbf4
取消依赖
Oct 24, 2022
cdd159e
修复引用
Oct 24, 2022
b90b48d
lint
Oct 24, 2022
04d6bbb
recv
Oct 24, 2022
f845778
添加key
Oct 24, 2022
db0ecc4
fmt
Oct 25, 2022
0280134
替换地址
Oct 25, 2022
57ba3ce
conflict
Oct 25, 2022
2457de7
addr
Oct 25, 2022
7cf382a
jaeger
Oct 25, 2022
cbd0a11
ci
Oct 25, 2022
2f39cf9
ci
Oct 25, 2022
1f6cde7
delete redis
Oct 25, 2022
92f4738
name
Oct 25, 2022
d3fff49
test ip
Oct 26, 2022
196e0eb
port
Oct 26, 2022
7032bf7
beauty
Oct 26, 2022
4b19e73
fmt
Oct 26, 2022
0458336
Merge branch 'master' of github.com:douyu/jupiter into feat-redigo
Oct 26, 2022
ecf7140
return err
Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ require (
github.com/alicebob/miniredis/v2 v2.23.0
github.com/apache/rocketmq-client-go/v2 v2.1.1
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0
github.com/coocood/freecache v1.2.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge下master分支

github.com/cosmtrek/air v1.40.4
github.com/davecgh/go-spew v1.1.1
github.com/dimiro1/banner v1.1.0
github.com/fatih/color v1.13.0
github.com/fatih/structtag v1.2.0
github.com/flosch/pongo2 v0.0.0-20200518135938-dfb43dbdc22a
github.com/fsnotify/fsnotify v1.6.0
github.com/fsnotify/fsnotify v1.5.4
github.com/gin-gonic/gin v1.8.1
github.com/go-basic/ipv4 v1.0.0
github.com/go-redis/redis v6.15.8+incompatible
Expand All @@ -27,17 +26,16 @@ require (
github.com/hnlq715/struct2interface v0.1.2
github.com/json-iterator/go v1.1.12
github.com/juju/ratelimit v1.0.2
github.com/labstack/echo/v4 v4.9.1
github.com/labstack/echo/v4 v4.9.0
github.com/mattn/go-colorable v0.1.13
github.com/mitchellh/mapstructure v1.5.0
github.com/modern-go/reflect2 v1.0.2
github.com/onsi/ginkgo/v2 v2.3.1
github.com/onsi/gomega v1.22.1
github.com/onsi/ginkgo/v2 v2.2.0
github.com/onsi/gomega v1.21.1
github.com/philchia/agollo/v4 v4.1.4
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.13.0
github.com/robfig/cron/v3 v3.0.1
github.com/samber/lo v1.33.0
github.com/smallnest/weighted v0.0.0-20200122032019-adf21c9b8bd1
github.com/smartystreets/goconvey v1.7.2
github.com/spf13/cast v1.5.0
Expand All @@ -49,21 +47,26 @@ require (
go.etcd.io/etcd/api/v3 v3.5.5
go.etcd.io/etcd/client/v3 v3.5.5
go.mongodb.org/mongo-driver v1.10.3
go.opentelemetry.io/otel v1.11.1
go.opentelemetry.io/otel/exporters/jaeger v1.11.1
go.opentelemetry.io/otel/sdk v1.11.1
go.opentelemetry.io/otel/trace v1.11.1
go.opentelemetry.io/otel v1.10.0
go.opentelemetry.io/otel/exporters/jaeger v1.9.0
go.opentelemetry.io/otel/sdk v1.9.0
go.opentelemetry.io/otel/trace v1.10.0
go.uber.org/automaxprocs v1.5.1
go.uber.org/multierr v1.7.0
go.uber.org/zap v1.23.0
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
google.golang.org/grpc v1.50.1
google.golang.org/protobuf v1.28.1
gorm.io/driver/mysql v1.4.3
google.golang.org/grpc v1.50.0
gorm.io/driver/mysql v1.4.1
gorm.io/gorm v1.24.0
)

require (
github.com/coocood/freecache v1.2.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

require可以合并下

github.com/go-redis/redis/v8 v8.11.5
google.golang.org/protobuf v1.28.1
)

require (
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
Expand All @@ -76,6 +79,7 @@ require (
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
github.com/creack/pty v1.1.11 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
Expand All @@ -91,7 +95,7 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/gomodule/redigo v2.0.0+incompatible // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
github.com/grokify/html-strip-tags-go v0.0.1 // indirect
Expand All @@ -101,7 +105,7 @@ require (
github.com/jtolds/gls v4.20.0+incompatible // indirect
github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5 // indirect
github.com/klauspost/compress v1.15.0 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/labstack/gommon v0.3.1 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/lib/pq v1.10.5 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
Expand All @@ -110,7 +114,6 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
Expand Down Expand Up @@ -140,10 +143,10 @@ require (
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.12 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
Expand Down
Loading