Merge pull request #266 from suyuan32/dev

fix: upgrade go redis to v9.5.1 to solve the incompatible bug for older versions
suyuan32 · Feb 21, 2024 · 417ec04 · 417ec04
2 parents 565bdda + 8668470
commit 417ec04
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 44 deletions.
diff --git a/README.En.md b/README.En.md
@@ -7,9 +7,9 @@
 ---
 [![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.6.2-brightgreen.svg)](https://go-zero.dev/)
 [![Vben Admin](https://img.shields.io/badge/Vben%20Admin-v2.10.1-yellow.svg)](https://vvbin.cn/doc-next/)
-[![Ent](https://img.shields.io/badge/Ent-v0.12.5-blue.svg)](https://entgo.io/)
-[![Casbin](https://img.shields.io/badge/Casbin-v2.81.0-orange.svg)](https://github.com/casbin/casbin)
-[![Release](https://img.shields.io/badge/Release-v1.3.5-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
+[![Ent](https://img.shields.io/badge/Ent-v0.13.0-blue.svg)](https://entgo.io/)
+[![Casbin](https://img.shields.io/badge/Casbin-v2.82.0-orange.svg)](https://github.com/casbin/casbin)
+[![Release](https://img.shields.io/badge/Release-v1.3.8-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![SimpleAdmin](https://dcbadge.vercel.app/api/server/NDED5p2hJk)](https://discord.gg/NDED5p2hJk)
 ![公众号](https://img.shields.io/badge/%E5%85%AC%E4%BC%97%E5%8F%B7-%E5%87%A0%E9%A2%97%E9%85%A5-blue)

diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@
 ---
 [![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.6.2-brightgreen.svg)](https://go-zero.dev/)
 [![Vben Admin](https://img.shields.io/badge/Vben%20Admin-v2.10.1-yellow.svg)](https://vvbin.cn/doc-next/)
-[![Ent](https://img.shields.io/badge/Ent-v0.12.5-blue.svg)](https://entgo.io/)
-[![Casbin](https://img.shields.io/badge/Casbin-v2.81.0-orange.svg)](https://github.com/casbin/casbin)
-[![Release](https://img.shields.io/badge/Release-v1.3.5-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
+[![Ent](https://img.shields.io/badge/Ent-v0.13.0-blue.svg)](https://entgo.io/)
+[![Casbin](https://img.shields.io/badge/Casbin-v2.82.0-orange.svg)](https://github.com/casbin/casbin)
+[![Release](https://img.shields.io/badge/Release-v1.3.8-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![SimpleAdmin](https://dcbadge.vercel.app/api/server/NDED5p2hJk)](https://discord.gg/NDED5p2hJk)
 ![公众号](https://img.shields.io/badge/%E5%85%AC%E4%BC%97%E5%8F%B7-%E5%87%A0%E9%A2%97%E9%85%A5-blue)

diff --git a/api/core.go b/api/core.go
@@ -5,7 +5,7 @@
 //		Schemes: http, https
 //		Host: localhost:9100
 //		BasePath: /
-//		Version: 1.3.7
+//		Version: 1.3.8
 //		Contact: yuansu.china.work@gmail.com
 //		SecurityDefinitions:
 //		  Token:

diff --git a/core.json b/core.json
@@ -16,7 +16,7 @@
     "contact": {
       "email": "yuansu.china.work@gmail.com"
     },
-    "version": "1.3.7"
+    "version": "1.3.8"
   },
   "host": "localhost:9100",
   "basePath": "/",

diff --git a/deploy/docker-compose/all_in_one/mysql/docker-compose.yaml b/deploy/docker-compose/all_in_one/mysql/docker-compose.yaml
@@ -58,7 +58,7 @@ services:
           memory: 200M
 
   core-rpc:
-    image: ryanpower/core-rpc-docker:v1.3.7
+    image: ryanpower/core-rpc-docker:v1.3.8
     container_name: core-rpc
     restart: always
     ports:
@@ -83,7 +83,7 @@ services:
           memory: 200M
 
   job-rpc:
-    image: ryanpower/job-rpc-docker:v1.3.7
+    image: ryanpower/job-rpc-docker:v1.3.8
     container_name: job-rpc
     restart: always
     ports:
@@ -108,7 +108,7 @@ services:
           memory: 200M
 
   core-api:
-    image: ryanpower/core-api-docker:v1.3.7
+    image: ryanpower/core-api-docker:v1.3.8
     container_name: core-api
     restart: always
     environment:
@@ -135,7 +135,7 @@ services:
           memory: 200M
 
   backend-ui:
-    image: ryanpower/backend-ui-docker:v1.3.7
+    image: ryanpower/backend-ui-docker:v1.3.8
     container_name: backend-ui
     restart: always
     ports:
@@ -154,7 +154,7 @@ services:
           memory: 200M
 
   fms-api:
-    image: ryanpower/fms-api-docker:v1.3.7
+    image: ryanpower/fms-api-docker:v1.3.8
     container_name: fms-api
     restart: always
     #    environment:
@@ -185,7 +185,7 @@ services:
           memory: 200M
 
   mcms-rpc:
-    image: ryanpower/mcms-rpc-docker:v1.3.7
+    image: ryanpower/mcms-rpc-docker:v1.3.8
     container_name: mcms-rpc
     restart: always
     environment:

diff --git a/deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml b/deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml
@@ -56,7 +56,7 @@ services:
           memory: 200M
 
   core-rpc:
-    image: ryanpower/core-rpc-docker:v1.3.7
+    image: ryanpower/core-rpc-docker:v1.3.8
     container_name: core-rpc
     restart: always
     #    ports:
@@ -75,7 +75,7 @@ services:
           memory: 200M
 
   job-rpc:
-    image: ryanpower/job-rpc-docker:v1.3.7
+    image: ryanpower/job-rpc-docker:v1.3.8
     container_name: job-rpc
     restart: always
     #    ports:
@@ -94,7 +94,7 @@ services:
           memory: 200M
 
   core-api:
-    image: ryanpower/core-api-docker:v1.3.7
+    image: ryanpower/core-api-docker:v1.3.8
     container_name: core-api
     restart: always
     environment:
@@ -116,7 +116,7 @@ services:
           memory: 200M
 
   backend-ui:
-    image: ryanpower/backend-ui-docker:v1.3.7
+    image: ryanpower/backend-ui-docker:v1.3.8
     container_name: backend-ui
     restart: always
     ports:
@@ -135,7 +135,7 @@ services:
           memory: 200M
 
   fms-api:
-    image: ryanpower/fms-api-docker:v1.3.7
+    image: ryanpower/fms-api-docker:v1.3.8
     container_name: fms-api
     restart: always
     #    environment:
@@ -160,7 +160,7 @@ services:
           memory: 200M
 
   mcms-rpc:
-    image: ryanpower/mcms-rpc-docker:v1.3.7
+    image: ryanpower/mcms-rpc-docker:v1.3.8
     container_name: mcms-rpc
     restart: always
     #    environment:

diff --git a/go.mod b/go.mod
@@ -9,10 +9,10 @@ require (
 	github.com/duke-git/lancet/v2 v2.2.9
 	github.com/gofrs/uuid/v5 v5.0.0
 	github.com/mojocn/base64Captcha v1.3.6
-	github.com/redis/go-redis/v9 v9.5.0
-	github.com/suyuan32/simple-admin-common v1.3.7
-	github.com/suyuan32/simple-admin-job v1.3.7
-	github.com/suyuan32/simple-admin-message-center v1.3.7
+	github.com/redis/go-redis/v9 v9.5.1
+	github.com/suyuan32/simple-admin-common v1.3.8
+	github.com/suyuan32/simple-admin-job v1.3.8
+	github.com/suyuan32/simple-admin-message-center v1.3.8
 	github.com/zeromicro/go-zero v1.6.2
 	golang.org/x/oauth2 v0.17.0
 	google.golang.org/grpc v1.61.1
@@ -115,9 +115,9 @@ require (
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect
+	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -132,4 +132,4 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace github.com/zeromicro/go-zero v1.6.2 => github.com/suyuan32/simple-admin-tools v1.6.6
+replace github.com/zeromicro/go-zero v1.6.2 => github.com/suyuan32/simple-admin-tools v1.6.7
diff --git a/go.sum b/go.sum
@@ -417,8 +417,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/redis/go-redis/v9 v9.5.0 h1:Xe9TKMmZv939gwTBcvc0n1tzK5l2re0pKw/W/tN3amw=
-github.com/redis/go-redis/v9 v9.5.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8=
+github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -470,14 +470,14 @@ github.com/stretchr/testify v1.8.1/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.3.7 h1:4VimNvod4suFzwAqQw7hqHHPgLrQL6VFl88gvitEusY=
-github.com/suyuan32/simple-admin-common v1.3.7/go.mod h1:ArDBtcW1IcvQjox5iZPxPFmL9L1qWPPCOIaL26Ik5Hc=
-github.com/suyuan32/simple-admin-job v1.3.7 h1:5e3bStU+rxpBtGIthEKB04UcZiR1nMX9cA7OE6icBL0=
-github.com/suyuan32/simple-admin-job v1.3.7/go.mod h1:NEGoekceJD9tbDZPVOy0APpxluY/m8TKNyQY0gtEN70=
-github.com/suyuan32/simple-admin-message-center v1.3.7 h1:xir+4nGNAiDYXPefjPOw69kM2NXWs0kLM1M26S56TmI=
-github.com/suyuan32/simple-admin-message-center v1.3.7/go.mod h1:ndUZdvTitSwUtYBqFRsmOYKuIQeYG25dMkic6WJ2Ssk=
-github.com/suyuan32/simple-admin-tools v1.6.6 h1:kBwa77wHMOYN9BZ2hXaonThLrEB1stKXBH2Ex5j/M3E=
-github.com/suyuan32/simple-admin-tools v1.6.6/go.mod h1:fyASqyeUhvwzDVsnidMpIwMlNIGd/RQCJ7aIoSQMxkM=
+github.com/suyuan32/simple-admin-common v1.3.8 h1:vXihZoOg3H5uqj44FpcE8uyE7aYkCGhuTlBXKxiqhEw=
+github.com/suyuan32/simple-admin-common v1.3.8/go.mod h1:mRXtHbRsNMwwmep1fqYBSKtJShd2df3RXsTsYyqKWa8=
+github.com/suyuan32/simple-admin-job v1.3.8 h1:cPuv3tubyknhXNIGo8toM6ODcAUG6JVMF7No4IZ1E+E=
+github.com/suyuan32/simple-admin-job v1.3.8/go.mod h1:v2rfluamP8se8uzVqBwx7AtXzOtdaGzhMdBG9vZ7LNI=
+github.com/suyuan32/simple-admin-message-center v1.3.8 h1:kdR5yqsisoqsvv6FtFXNaXkPv8P6SkROw80pVf5My0A=
+github.com/suyuan32/simple-admin-message-center v1.3.8/go.mod h1:OtflDt6ugU/a3S28aMUQsbBKxPjZn/gCCNp4OtEfLhc=
+github.com/suyuan32/simple-admin-tools v1.6.7 h1:m+j6xDRV9UP+3yx5eqJqgEfmy1WK42SYKs5tqvZLyso=
+github.com/suyuan32/simple-admin-tools v1.6.7/go.mod h1:JAEvJhPfdC2FnrZxRZjlu8sobrNRTSuKmTZZPwQEHJA=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -741,12 +741,12 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 h1:g/4bk7P6TPMkAUbUhquq98xey1slwvuVJPosdBqYJlU=
-google.golang.org/genproto v0.0.0-20240205150955-31a09d347014/go.mod h1:xEgQu1e4stdSSsxPDK8Azkrk/ECl5HvdPf6nbZrTS5M=
-google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 h1:4++qSzdWBUy9/2x8L5KZgwZw+mjJZ2yDSCGMVM0YzRs=
-google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:PVreiBMirk8ypES6aw9d4p6iiBNSIfZEBqr3UGoAi2E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 h1:FSL3lRCkhaPFxqi0s9o+V4UI2WTzAVOvkgbd4kVV4Wg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4=
+google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y=
+google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s=
+google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o=
+google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=