Skip to content

Commit

Permalink
Merge pull request #244 from suyuan32/dev
Browse files Browse the repository at this point in the history 
fix: use universal redis
  • Loading branch information
@suyuan32
suyuan32 authored Dec 28, 2023
2 parents ee13714 + 234be7a commit a149182
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 21 deletions.
2 changes: 1 addition & 1 deletion api/core.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Schemes: http, https
// Host: localhost:9100
// BasePath: /
// Version: 1.2.8
// Version: 1.3.0
// Contact: [email protected]
// SecurityDefinitions:
// Token:
Expand Down
4 changes: 2 additions & 2 deletions api/internal/middleware/authority_middleware.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (

type AuthorityMiddleware struct {
Cbn *casbin.Enforcer
Rds *redis.Client
Rds redis.UniversalClient
Trans *i18n.Translator
BanRoleData map[string]bool
}

func NewAuthorityMiddleware(cbn *casbin.Enforcer, rds *redis.Client, trans *i18n.Translator, banRoleData map[string]bool) *AuthorityMiddleware {
func NewAuthorityMiddleware(cbn *casbin.Enforcer, rds redis.UniversalClient, trans *i18n.Translator, banRoleData map[string]bool) *AuthorityMiddleware {
return &AuthorityMiddleware{
Cbn: cbn,
Rds: rds,
Expand Down
4 changes: 2 additions & 2 deletions api/internal/svc/service_context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ type ServiceContext struct {
CoreRpc coreclient.Core
JobRpc jobclient.Job
McmsRpc mcmsclient.Mcms
Redis *redis.Client
Redis redis.UniversalClient
Casbin *casbin.Enforcer
Trans *i18n.Translator
Captcha *base64Captcha.Captcha
BanRoleData map[string]bool // ban role means the role status is not normal
}

func NewServiceContext(c config.Config) *ServiceContext {
rds := c.RedisConf.MustNewRedis()
rds := c.RedisConf.MustNewUniversalRedis()

cbn := c.CasbinConf.MustNewCasbinWithOriginalRedisWatcher(c.DatabaseConf.Type, c.DatabaseConf.GetDSN(),
c.RedisConf)
Expand Down
2 changes: 1 addition & 1 deletion core.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"contact": {
"email": "[email protected]"
},
"version": "1.2.8"
"version": "1.3.0"
},
"host": "localhost:9100",
"basePath": "/",
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ require (
github.com/gofrs/uuid/v5 v5.0.0
github.com/mojocn/base64Captcha v1.3.6
github.com/redis/go-redis/v9 v9.3.1
github.com/suyuan32/simple-admin-common v1.2.8
github.com/suyuan32/simple-admin-job v1.2.8
github.com/suyuan32/simple-admin-message-center v1.2.8
github.com/suyuan32/simple-admin-common v1.3.0
github.com/suyuan32/simple-admin-job v1.3.0
github.com/suyuan32/simple-admin-message-center v1.3.0
github.com/zeromicro/go-zero v1.6.1
golang.org/x/oauth2 v0.15.0
google.golang.org/grpc v1.60.1
Expand Down
16 changes: 6 additions & 10 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
Expand Down Expand Up @@ -386,7 +385,6 @@ github.com/nicksnyder/go-i18n/v2 v2.3.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7g
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
Expand Down Expand Up @@ -459,8 +457,6 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
Expand All @@ -484,12 +480,12 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/suyuan32/simple-admin-common v1.2.8 h1:fefZimkkC4eTsQ422alwHczMCFF8X547CagvtF5jg1A=
github.com/suyuan32/simple-admin-common v1.2.8/go.mod h1:MI5f0TIeUpiXx7sVvmuYlOm5R5W/wAOBD4BU1nCCs4E=
github.com/suyuan32/simple-admin-job v1.2.8 h1:UzOeov5hMsqslbjSkMLKCEVj6YwnHdheyVhIrOBqix4=
github.com/suyuan32/simple-admin-job v1.2.8/go.mod h1:PqVQjwhODnZVN3UyRUxuKAU0R8EliGYnR6VmTZG4mRw=
github.com/suyuan32/simple-admin-message-center v1.2.8 h1:3nzFN/keVcwkd7nNtWIrQR3MgUlblQBGgkoc1OQ5pVI=
github.com/suyuan32/simple-admin-message-center v1.2.8/go.mod h1:5gQobfwS93WwLTIMWgvdMhLGEs+aMj2/7S3iooCuICw=
github.com/suyuan32/simple-admin-common v1.3.0 h1:DQZ6XnRl1cP8aAEbLp35V5RiXe88X1gPQUy8+FmVjhU=
github.com/suyuan32/simple-admin-common v1.3.0/go.mod h1:MI5f0TIeUpiXx7sVvmuYlOm5R5W/wAOBD4BU1nCCs4E=
github.com/suyuan32/simple-admin-job v1.3.0 h1:w+/Qo0tK1jt1XhNaN/nJ4M168j0Z9KCJU65fTIiD3xc=
github.com/suyuan32/simple-admin-job v1.3.0/go.mod h1:xcWTU7/ECUKoagw97t4DJ/i7UpxUNCYVSEhognCpueM=
github.com/suyuan32/simple-admin-message-center v1.3.0 h1:VEl1xUqKAsesqco731sescf390Pfyl6chBZh7uW9KWk=
github.com/suyuan32/simple-admin-message-center v1.3.0/go.mod h1:vz4XCEkkmHU9EZ10J+v3AJRgZaBWFGE/uFOhl2Qic1I=
github.com/suyuan32/simple-admin-tools v1.6.3 h1:BgasHW7GBJfbOhQqvdnovATYpGEsEEd2PtGS0xfksuQ=
github.com/suyuan32/simple-admin-tools v1.6.3/go.mod h1:TxS7kvMSnTI0HrqCXUjDoSfuQh+WfJ1x073DzVs3UAc=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
Expand Down
4 changes: 2 additions & 2 deletions rpc/internal/svc/service_context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
type ServiceContext struct {
Config config.Config
DB *ent.Client
Redis *redis.Client
Redis redis.UniversalClient
}

func NewServiceContext(c config.Config) *ServiceContext {
Expand All @@ -26,6 +26,6 @@ func NewServiceContext(c config.Config) *ServiceContext {
return &ServiceContext{
Config: c,
DB: db,
Redis: c.RedisConf.MustNewRedis(),
Redis: c.RedisConf.MustNewUniversalRedis(),
}
}

0 comments on commit a149182

Please sign in to comment.