Merge pull request #265 from suyuan32/dev

fix: upgrade common to v1.3.7 to fix redis version bug
suyuan32 · Feb 20, 2024 · 565bdda · 565bdda
2 parents 77023d9 + fc2bd7b
commit 565bdda
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/api/core.go b/api/core.go
@@ -5,7 +5,7 @@
 //		Schemes: http, https
 //		Host: localhost:9100
 //		BasePath: /
-//		Version: 1.3.6
+//		Version: 1.3.7
 //		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.6"
+    "version": "1.3.7"
   },
   "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
@@ -37,7 +37,7 @@ services:
           memory: 200M
 
   redis:
-    image: redis:7.0.5-alpine
+    image: redis:7.2-alpine
     container_name: redis
     restart: always
     ports:
@@ -58,7 +58,7 @@ services:
           memory: 200M
 
   core-rpc:
-    image: ryanpower/core-rpc-docker:v1.3.5
+    image: ryanpower/core-rpc-docker:v1.3.7
     container_name: core-rpc
     restart: always
     ports:
@@ -83,7 +83,7 @@ services:
           memory: 200M
 
   job-rpc:
-    image: ryanpower/job-rpc-docker:v1.3.5
+    image: ryanpower/job-rpc-docker:v1.3.7
     container_name: job-rpc
     restart: always
     ports:
@@ -108,7 +108,7 @@ services:
           memory: 200M
 
   core-api:
-    image: ryanpower/core-api-docker:v1.3.5
+    image: ryanpower/core-api-docker:v1.3.7
     container_name: core-api
     restart: always
     environment:
@@ -135,7 +135,7 @@ services:
           memory: 200M
 
   backend-ui:
-    image: ryanpower/backend-ui-docker:v1.3.5
+    image: ryanpower/backend-ui-docker:v1.3.7
     container_name: backend-ui
     restart: always
     ports:
@@ -154,7 +154,7 @@ services:
           memory: 200M
 
   fms-api:
-    image: ryanpower/fms-api-docker:v1.3.5
+    image: ryanpower/fms-api-docker:v1.3.7
     container_name: fms-api
     restart: always
     #    environment:
@@ -185,7 +185,7 @@ services:
           memory: 200M
 
   mcms-rpc:
-    image: ryanpower/mcms-rpc-docker:v1.3.5
+    image: ryanpower/mcms-rpc-docker:v1.3.7
     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
@@ -35,7 +35,7 @@ services:
           memory: 200M
 
   redis:
-    image: redis:7.0.5-alpine
+    image: redis:7.2-alpine
     container_name: redis
     restart: always
     ports:
@@ -56,7 +56,7 @@ services:
           memory: 200M
 
   core-rpc:
-    image: ryanpower/core-rpc-docker:v1.3.5
+    image: ryanpower/core-rpc-docker:v1.3.7
     container_name: core-rpc
     restart: always
     #    ports:
@@ -75,7 +75,7 @@ services:
           memory: 200M
 
   job-rpc:
-    image: ryanpower/job-rpc-docker:v1.3.5
+    image: ryanpower/job-rpc-docker:v1.3.7
     container_name: job-rpc
     restart: always
     #    ports:
@@ -94,7 +94,7 @@ services:
           memory: 200M
 
   core-api:
-    image: ryanpower/core-api-docker:v1.3.5
+    image: ryanpower/core-api-docker:v1.3.7
     container_name: core-api
     restart: always
     environment:
@@ -116,7 +116,7 @@ services:
           memory: 200M
 
   backend-ui:
-    image: ryanpower/backend-ui-docker:v1.3.5
+    image: ryanpower/backend-ui-docker:v1.3.7
     container_name: backend-ui
     restart: always
     ports:
@@ -135,7 +135,7 @@ services:
           memory: 200M
 
   fms-api:
-    image: ryanpower/fms-api-docker:v1.3.5
+    image: ryanpower/fms-api-docker:v1.3.7
     container_name: fms-api
     restart: always
     #    environment:
@@ -160,7 +160,7 @@ services:
           memory: 200M
 
   mcms-rpc:
-    image: ryanpower/mcms-rpc-docker:v1.3.5
+    image: ryanpower/mcms-rpc-docker:v1.3.7
     container_name: mcms-rpc
     restart: always
     #    environment:

diff --git a/go.mod b/go.mod
@@ -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.5.0
-	github.com/suyuan32/simple-admin-common v1.3.6
-	github.com/suyuan32/simple-admin-job v1.3.6
-	github.com/suyuan32/simple-admin-message-center v1.3.6
+	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/zeromicro/go-zero v1.6.2
 	golang.org/x/oauth2 v0.17.0
 	google.golang.org/grpc v1.61.1

diff --git a/go.sum b/go.sum
@@ -470,12 +470,12 @@ 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.6 h1:y8/2D5ogKr3yRpDxMRbykAUFICOBVwB33Jd54pb/nV0=
-github.com/suyuan32/simple-admin-common v1.3.6/go.mod h1:ArDBtcW1IcvQjox5iZPxPFmL9L1qWPPCOIaL26Ik5Hc=
-github.com/suyuan32/simple-admin-job v1.3.6 h1:cMtZmAvVqnWctAO0ogACvSl/M7IyqytubkbNrGxYN2A=
-github.com/suyuan32/simple-admin-job v1.3.6/go.mod h1:/LMkgYmBkFe/x2jlR40t1/34+a+FY+Aaae058H8ZCwE=
-github.com/suyuan32/simple-admin-message-center v1.3.6 h1:f6FWwZIb2kyFYYnUlH7xdTcq6lo3vAfvxgQOH8DAibQ=
-github.com/suyuan32/simple-admin-message-center v1.3.6/go.mod h1:WWuCWpyp/le0IYchy1HZYwBdLFgc8pFDZ3Y1lI+vRmE=
+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/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=