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.

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

chore: upgrade deps and system version #311

Merged
merged 1 commit into from
Jun 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.En.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.6.5-brightgreen.svg)](https://go-zero.dev/)
[![Vben Admin](https://img.shields.io/badge/Vben%20Admin-v2.11.4-yellow.svg)](https://vvbin.cn/doc-next/)
[![Ent](https://img.shields.io/badge/Ent-v0.13.1-blue.svg)](https://entgo.io/)
[![Casbin](https://img.shields.io/badge/Casbin-v2.89.0-orange.svg)](https://github.com/casbin/casbin)
[![Release](https://img.shields.io/badge/Release-v1.4.3-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
[![Casbin](https://img.shields.io/badge/Casbin-v2.93.0-orange.svg)](https://github.com/casbin/casbin)
[![Release](https://img.shields.io/badge/Release-v1.4.5-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)
![公众号](https://img.shields.io/badge/%E5%85%AC%E4%BC%97%E5%8F%B7-%E5%87%A0%E9%A2%97%E9%85%A5-blue)
![注意](https://img.shields.io/badge/%E6%B3%A8%E6%84%8F-%E5%85%B3%E6%B3%A8%E5%85%AC%E4%BC%97%E5%8F%B7%E5%8A%A0%E5%85%A5%E5%BE%AE%E4%BF%A1%E7%BE%A4-blue)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.6.5-brightgreen.svg)](https://go-zero.dev/)
[![Vben Admin](https://img.shields.io/badge/Vben%20Admin-v2.11.4-yellow.svg)](https://vvbin.cn/doc-next/)
[![Ent](https://img.shields.io/badge/Ent-v0.13.1-blue.svg)](https://entgo.io/)
[![Casbin](https://img.shields.io/badge/Casbin-v2.89.0-orange.svg)](https://github.com/casbin/casbin)
[![Release](https://img.shields.io/badge/Release-v1.4.3-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
[![Casbin](https://img.shields.io/badge/Casbin-v2.93.0-orange.svg)](https://github.com/casbin/casbin)
[![Release](https://img.shields.io/badge/Release-v1.4.5-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)
![公众号](https://img.shields.io/badge/%E5%85%AC%E4%BC%97%E5%8F%B7-%E5%87%A0%E9%A2%97%E9%85%A5-blue)
![注意](https://img.shields.io/badge/%E6%B3%A8%E6%84%8F-%E5%85%B3%E6%B3%A8%E5%85%AC%E4%BC%97%E5%8F%B7%E5%8A%A0%E5%85%A5%E5%BE%AE%E4%BF%A1%E7%BE%A4-blue)
Expand Down
2 changes: 1 addition & 1 deletion api/core.go
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.4.4
// Version: 1.4.5
// Contact: [email protected]
// SecurityDefinitions:
// Token:
Expand Down
2 changes: 1 addition & 1 deletion core.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"contact": {
"email": "[email protected]"
},
"version": "1.4.4"
"version": "1.4.5"
},
"host": "localhost:9100",
"basePath": "/",
Expand Down
12 changes: 6 additions & 6 deletions deploy/docker-compose/all_in_one/mysql/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
memory: 200M

core-rpc:
image: ryanpower/core-rpc-docker:v1.4.4
image: ryanpower/core-rpc-docker:v1.4.5
container_name: core-rpc
restart: always
ports:
Expand All @@ -83,7 +83,7 @@ services:
memory: 200M

job-rpc:
image: ryanpower/job-rpc-docker:v1.4.4
image: ryanpower/job-rpc-docker:v1.4.5
container_name: job-rpc
restart: always
ports:
Expand All @@ -108,7 +108,7 @@ services:
memory: 200M

core-api:
image: ryanpower/core-api-docker:v1.4.4
image: ryanpower/core-api-docker:v1.4.5
container_name: core-api
restart: always
environment:
Expand All @@ -135,7 +135,7 @@ services:
memory: 200M

backend-ui:
image: ryanpower/backend-ui-docker:v1.4.4
image: ryanpower/backend-ui-docker:v1.4.5
container_name: backend-ui
restart: always
ports:
Expand All @@ -154,7 +154,7 @@ services:
memory: 200M

fms-api:
image: ryanpower/fms-api-docker:v1.4.4
image: ryanpower/fms-api-docker:v1.4.5
container_name: fms-api
restart: always
# environment:
Expand Down Expand Up @@ -185,7 +185,7 @@ services:
memory: 200M

mcms-rpc:
image: ryanpower/mcms-rpc-docker:v1.4.4
image: ryanpower/mcms-rpc-docker:v1.4.5
container_name: mcms-rpc
restart: always
environment:
Expand Down
12 changes: 6 additions & 6 deletions deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ services:
memory: 200M

core-rpc:
image: ryanpower/core-rpc-docker:v1.4.4
image: ryanpower/core-rpc-docker:v1.4.5
container_name: core-rpc
restart: always
# ports:
Expand All @@ -75,7 +75,7 @@ services:
memory: 200M

job-rpc:
image: ryanpower/job-rpc-docker:v1.4.4
image: ryanpower/job-rpc-docker:v1.4.5
container_name: job-rpc
restart: always
# ports:
Expand All @@ -94,7 +94,7 @@ services:
memory: 200M

core-api:
image: ryanpower/core-api-docker:v1.4.4
image: ryanpower/core-api-docker:v1.4.5
container_name: core-api
restart: always
environment:
Expand All @@ -116,7 +116,7 @@ services:
memory: 200M

backend-ui:
image: ryanpower/backend-ui-docker:v1.4.4
image: ryanpower/backend-ui-docker:v1.4.5
container_name: backend-ui
restart: always
ports:
Expand All @@ -135,7 +135,7 @@ services:
memory: 200M

fms-api:
image: ryanpower/fms-api-docker:v1.4.4
image: ryanpower/fms-api-docker:v1.4.5
container_name: fms-api
restart: always
# environment:
Expand All @@ -160,7 +160,7 @@ services:
memory: 200M

mcms-rpc:
image: ryanpower/mcms-rpc-docker:v1.4.4
image: ryanpower/mcms-rpc-docker:v1.4.5
container_name: mcms-rpc
restart: always
# environment:
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ go 1.22.3
require (
entgo.io/ent v0.13.1
github.com/bsm/redislock v0.9.4
github.com/casbin/casbin/v2 v2.90.0
github.com/casbin/casbin/v2 v2.94.0
github.com/duke-git/lancet/v2 v2.3.1
github.com/gofrs/uuid/v5 v5.2.0
github.com/mojocn/base64Captcha v1.3.6
github.com/redis/go-redis/v9 v9.5.2
github.com/suyuan32/simple-admin-common v1.4.4
github.com/suyuan32/simple-admin-job v1.4.4
github.com/suyuan32/simple-admin-message-center v1.4.4
github.com/redis/go-redis/v9 v9.5.3
github.com/suyuan32/simple-admin-common v1.4.5
github.com/suyuan32/simple-admin-job v1.4.5
github.com/suyuan32/simple-admin-message-center v1.4.5
github.com/zeromicro/go-zero v1.6.5
golang.org/x/oauth2 v0.21.0
google.golang.org/grpc v1.64.0
Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0
github.com/bsm/redislock v0.9.4 h1:X/Wse1DPpiQgHbVYRE9zv6m070UcKoOGekgvpNhiSvw=
github.com/bsm/redislock v0.9.4/go.mod h1:Epf7AJLiSFwLCiZcfi6pWFO/8eAYrYpQXFxEDPoDeAk=
github.com/casbin/casbin/v2 v2.29.2/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
github.com/casbin/casbin/v2 v2.90.0 h1:65jvnocLmG8FfrfKcuqRd+Tp5B7R/OBxOVu1IhUMT5A=
github.com/casbin/casbin/v2 v2.90.0/go.mod h1:jX8uoN4veP85O/n2674r2qtfSXI6myvxW85f6TH50fw=
github.com/casbin/casbin/v2 v2.94.0 h1:bhCl2pqn4Zylgze2T0mWwLqBiC5H0+tx/Pi6X3KlDxY=
github.com/casbin/casbin/v2 v2.94.0/go.mod h1:jX8uoN4veP85O/n2674r2qtfSXI6myvxW85f6TH50fw=
github.com/casbin/ent-adapter v0.3.0 h1:4lkhB/BwXAhj84iSrZG/gQ4avkO4uPwz4kdDP1VEnww=
github.com/casbin/ent-adapter v0.3.0/go.mod h1:U6saAFuVDEOWLCtrgx35d95M12FC0uh5GtJL82QunRM=
github.com/casbin/govaluate v1.1.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A=
Expand Down Expand Up @@ -414,8 +414,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/redis/go-redis/v9 v9.5.2 h1:L0L3fcSNReTRGyZ6AqAEN0K56wYeYAwapBIhkvh0f3E=
github.com/redis/go-redis/v9 v9.5.2/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
github.com/redis/go-redis/v9 v9.5.3 h1:fOAp1/uJG+ZtcITgZOfYFmTKPE7n4Vclj1wZFgRciUU=
github.com/redis/go-redis/v9 v9.5.3/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.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
Expand Down Expand Up @@ -469,12 +469,12 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/suyuan32/base64Captcha v1.3.7 h1:B5+ArqVlnzdO+5oyHzvz1nKSipUcicaHEBMFZb7hpv4=
github.com/suyuan32/base64Captcha v1.3.7/go.mod h1:XXuqS4lYf+ANu15oTrA2Z47hv8R2h9nVVH5IJRmxLZQ=
github.com/suyuan32/simple-admin-common v1.4.4 h1:nql4JnQ0dhr62Yq9LUpm+dBUkAijv2w7HuiOMgnlHt0=
github.com/suyuan32/simple-admin-common v1.4.4/go.mod h1:kbWf2GijT0gOj8Bsi/voew17pYz8Yv20CPgQmPWRPyI=
github.com/suyuan32/simple-admin-job v1.4.4 h1:MQdEq929OVGYOnOD486R5FQl2g1GI2r1YTCACgOPN6c=
github.com/suyuan32/simple-admin-job v1.4.4/go.mod h1:zJGSLaVIBtK9QvQeZDWnLhhcy2wrbmzBXkpf9jh5Vy4=
github.com/suyuan32/simple-admin-message-center v1.4.4 h1:BtAjz0UUFErrpzRODHaTma8IKf8VCMvlDYJ7OEPMYVo=
github.com/suyuan32/simple-admin-message-center v1.4.4/go.mod h1:amlQcTH8jUVK58yKa5rAaboQgGVTCCOuYOYHudWMJ1k=
github.com/suyuan32/simple-admin-common v1.4.5 h1:E3+38voibAQn7OdTDZIc+6FSZfUzQzHkqusKL45/bYw=
github.com/suyuan32/simple-admin-common v1.4.5/go.mod h1:4IOgRGHAcfVZHKK/8t4vx+CyTDS0lyut8alKxYp8WLQ=
github.com/suyuan32/simple-admin-job v1.4.5 h1:gFuPZGeMvh/uvu99FzrfawwZ+OqX3RpQf7xEdYWWY/M=
github.com/suyuan32/simple-admin-job v1.4.5/go.mod h1:Oh6vVXNnAQ22yfetp9KVIg9DiGn6drRQXJDiEGjs6Vs=
github.com/suyuan32/simple-admin-message-center v1.4.5 h1:AMnyOu+X1eM/LFHqT3+XLeSapjqWaDPfS9Nk77S2V9o=
github.com/suyuan32/simple-admin-message-center v1.4.5/go.mod h1:qJR95k2IBalJujwqqMyANK3X8nuRAipeBS31bEGcwdY=
github.com/suyuan32/simple-admin-tools v1.6.13 h1:B7rWMHLrdrus1aDD8T1WKeNtoeCJrIDNDLFbfJAx8mU=
github.com/suyuan32/simple-admin-tools v1.6.13/go.mod h1:2GQvDFtFZmevmZYwoGkh7GsSFt2sNA1uFUssBuI+oDY=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
Expand Down