Merge pull request #32 from suyuan32/dev

chore: upgrade deps

Author: suyuan32

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.4
+FROM alpine:3.19
 
 # Define the project name | 定义项目名称
 ARG PROJECT=mms

go.mod

@@ -9,10 +9,10 @@ require (
 	github.com/duke-git/lancet/v2 v2.2.8
 	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-core v1.2.8
-	github.com/suyuan32/simple-admin-member-rpc v1.2.1-0.20231228014650-22458eaa4ca9
-	github.com/suyuan32/simple-admin-message-center v1.2.8
+	github.com/suyuan32/simple-admin-common v1.3.0
+	github.com/suyuan32/simple-admin-core v1.3.0
+	github.com/suyuan32/simple-admin-member-rpc v1.2.1
+	github.com/suyuan32/simple-admin-message-center v1.3.0
 	github.com/zeromicro/go-zero v1.6.1
 )
 

go.sum

@@ -476,14 +476,14 @@ 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-core v1.2.8 h1:2OUIocFPFoBMILyNeFHBUnSUFyz/NcLq1liql9puSyg=
-github.com/suyuan32/simple-admin-core v1.2.8/go.mod h1:ieAwyCfCVNbVT8+SDlzvFZWF1sUMZAlOhX4a9Kva4TM=
-github.com/suyuan32/simple-admin-member-rpc v1.2.1-0.20231228014650-22458eaa4ca9 h1:+mvJZfB52JmEjPCYHLQLOjRSJuWSnRImVa5qwGR5ylI=
-github.com/suyuan32/simple-admin-member-rpc v1.2.1-0.20231228014650-22458eaa4ca9/go.mod h1:FZz4MBZRuwJ+btHdzyNcGAtGIu311D9NO6z8nOGKvdo=
-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-core v1.3.0 h1:MtAItbrVUrZcRXp+WDcTnjAmMlbC7qho75/gj43jdfM=
+github.com/suyuan32/simple-admin-core v1.3.0/go.mod h1:nWIwqADzx9Un2X/gR9GOcAh5xrdxnPiiSXfNSkgj+Wk=
+github.com/suyuan32/simple-admin-member-rpc v1.2.1 h1:uLCjeMhScrmw411ZfGWplpYFc3tn4VYq4jxxzqMkBAw=
+github.com/suyuan32/simple-admin-member-rpc v1.2.1/go.mod h1:HnTxLs9U9vR6rvy/kWbGjSxe1lIOUoPlIuylDYJshOY=
+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=

internal/middleware/authority_middleware.go

@@ -20,11 +20,11 @@ import (
 
 type AuthorityMiddleware struct {
 	Cbn   *casbin.Enforcer
-	Rds   *redis.Client
+	Rds   redis.UniversalClient
 	Trans *i18n.Translator
 }
 
-func NewAuthorityMiddleware(cbn *casbin.Enforcer, rds *redis.Client, trans *i18n.Translator) *AuthorityMiddleware {
+func NewAuthorityMiddleware(cbn *casbin.Enforcer, rds redis.UniversalClient, trans *i18n.Translator) *AuthorityMiddleware {
 	return &AuthorityMiddleware{
 		Cbn:   cbn,
 		Rds:   rds,

internal/svc/service_context.go

@@ -30,12 +30,12 @@ type ServiceContext struct {
 	McmsRpc   mcmsclient.Mcms
 	Captcha   *base64Captcha.Captcha
 	CoreRpc   coreclient.Core
-	Redis     *redis.Client
+	Redis     redis.UniversalClient
 }
 
 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)
 

mms.go

@@ -5,7 +5,7 @@
 //	Schemes: http, https
 //	Host: localhost:9104
 //	BasePath: /
-//	Version: 1.2.0
+//	Version: 1.2.1
 //	SecurityDefinitions:
 //	  Token:
 //	    type: apiKey

mms.json

@@ -13,7 +13,7 @@
   "info": {
     "description": "MMS: Member Management Service",
     "title": "Simple Admin Member Management Service",
-    "version": "1.2.0"
+    "version": "1.2.1"
   },
   "host": "localhost:9104",
   "basePath": "/",