Skip to content

Commit

Permalink
chore: upgrade deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@suyuan32
suyuan32 committed Nov 25, 2024
1 parent 645437b commit b785516
Show file tree
Hide file tree
Showing 14 changed files with 81 additions and 83 deletions.
4 changes: 2 additions & 2 deletions README.En.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

**English** | [中文](./README.md)
---
[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.7.3-brightgreen.svg)](https://go-zero.dev/)
[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.7.4-brightgreen.svg)](https://go-zero.dev/)
[![Ent](https://img.shields.io/badge/Ent-v0.14.1-blue.svg)](https://entgo.io/)
[![Casbin](https://img.shields.io/badge/Casbin-v2.99.0-orange.svg)](https://github.com/casbin/casbin)
[![Release](https://img.shields.io/badge/Release-v1.5.8-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
[![Release](https://img.shields.io/badge/Release-v1.6.0-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
[![License: Apache2.0](https://img.shields.io/badge/License-Apache2.0-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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

**中文** | [English](./README.En.md)
---
[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.7.3-brightgreen.svg)](https://go-zero.dev/)
[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.7.4-brightgreen.svg)](https://go-zero.dev/)
[![Ent](https://img.shields.io/badge/Ent-v0.14.1-blue.svg)](https://entgo.io/)
[![Casbin](https://img.shields.io/badge/Casbin-v2.99.0-orange.svg)](https://github.com/casbin/casbin)
[![Release](https://img.shields.io/badge/Release-v1.5.8-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
[![Release](https://img.shields.io/badge/Release-v1.6.0-green.svg)](https://github.com/suyuan32/simple-admin-core/releases)
[![License: Apache2.0](https://img.shields.io/badge/License-Apache2.0-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
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.5.8
// Version: 1.6.0
// Contact: [email protected]
// SecurityDefinitions:
// Token:
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.5.8"
"version": "1.6.0"
},
"host": "localhost:9100",
"basePath": "/",
Expand Down
12 changes: 6 additions & 6 deletions deploy/docker-compose/all_in_one/mysql/docker-compose-cn.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ services:
memory: 200M

core-rpc:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.6.0
container_name: core-rpc
restart: always
ports:
Expand All @@ -82,7 +82,7 @@ services:
memory: 200M

job-rpc:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/job-rpc-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/job-rpc-docker:v1.6.0
container_name: job-rpc
restart: always
ports:
Expand All @@ -107,7 +107,7 @@ services:
memory: 200M

core-api:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.6.0
container_name: core-api
restart: always
environment:
Expand All @@ -134,7 +134,7 @@ services:
memory: 200M

backend-ui:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/backend-ui-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/backend-ui-vben5:v1.6.0-rc.2
container_name: backend-ui
restart: always
ports:
Expand All @@ -153,7 +153,7 @@ services:
memory: 200M

fms-api:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/fms-api-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/fms-api-docker:v1.6.0
container_name: fms-api
restart: always
# environment:
Expand Down Expand Up @@ -184,7 +184,7 @@ services:
memory: 200M

mcms-rpc:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/mcms-rpc-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/mcms-rpc-docker:v1.6.0
container_name: mcms-rpc
restart: always
environment:
Expand Down
12 changes: 6 additions & 6 deletions deploy/docker-compose/all_in_one/mysql/docker-compose.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ services:
memory: 200M

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

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

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

backend-ui:
image: ryanpower/backend-ui-docker:v1.5.8
image: ryanpower/backend-ui-vben5:v1.6.0-rc.2
container_name: backend-ui
restart: always
ports:
Expand All @@ -153,7 +153,7 @@ services:
memory: 200M

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

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

core-rpc:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.6.0
container_name: core-rpc
restart: always
# ports:
Expand All @@ -75,7 +75,7 @@ services:
memory: 200M

job-rpc:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/job-rpc-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/job-rpc-docker:v1.6.0
container_name: job-rpc
restart: always
# ports:
Expand All @@ -94,7 +94,7 @@ services:
memory: 200M

core-api:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.6.0
container_name: core-api
restart: always
# environment:
Expand All @@ -116,7 +116,7 @@ services:
memory: 200M

backend-ui:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/backend-ui-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/backend-ui-vben5:v1.6.0-rc.2
container_name: backend-ui
restart: always
ports:
Expand All @@ -135,7 +135,7 @@ services:
memory: 200M

fms-api:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/fms-api-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/fms-api-docker:v1.6.0
container_name: fms-api
restart: always
# environment:
Expand All @@ -160,7 +160,7 @@ services:
memory: 200M

mcms-rpc:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/mcms-rpc-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/mcms-rpc-docker:v1.6.0
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
View file
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.5.8
image: ryanpower/core-rpc-docker:v1.6.0
container_name: core-rpc
restart: always
# ports:
Expand All @@ -75,7 +75,7 @@ services:
memory: 200M

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

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

backend-ui:
image: ryanpower/backend-ui-docker:v1.5.8
image: ryanpower/backend-ui-vben5:v1.6.0-rc.2
container_name: backend-ui
restart: always
ports:
Expand All @@ -135,7 +135,7 @@ services:
memory: 200M

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

mcms-rpc:
image: ryanpower/mcms-rpc-docker:v1.5.8
image: ryanpower/mcms-rpc-docker:v1.6.0
container_name: mcms-rpc
restart: always
# environment:
Expand Down
4 changes: 2 additions & 2 deletions deploy/docker-compose/core-only/docker-compose-cn.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ services:
memory: 200M

core-rpc:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.6.0
container_name: core-rpc
restart: always
ports:
Expand All @@ -74,7 +74,7 @@ services:
memory: 200M

core-api:
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.5.8
image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.6.0
container_name: core-api
restart: always
# environment:
Expand Down
4 changes: 2 additions & 2 deletions deploy/docker-compose/core-only/docker-compose.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ services:
memory: 200M

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

core-api:
image: ryanpower/core-api-docker:v1.5.8
image: ryanpower/core-api-docker:v1.6.0
container_name: core-api
restart: always
# environment:
Expand Down
30 changes: 15 additions & 15 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ go 1.23.0
require (
entgo.io/ent v0.14.1
github.com/bsm/redislock v0.9.4
github.com/casbin/casbin/v2 v2.100.0
github.com/casbin/casbin/v2 v2.101.0
github.com/duke-git/lancet/v2 v2.3.3
github.com/gofrs/uuid/v5 v5.3.0
github.com/larksuite/oapi-sdk-go/v3 v3.3.7
github.com/mojocn/base64Captcha v1.3.6
github.com/redis/go-redis/v9 v9.7.0
github.com/suyuan32/simple-admin-common v1.5.8
github.com/suyuan32/simple-admin-job v1.5.8
github.com/suyuan32/simple-admin-message-center v1.5.8
github.com/zeromicro/go-zero v1.7.3
github.com/suyuan32/simple-admin-common v1.6.0
github.com/suyuan32/simple-admin-job v1.6.0
github.com/suyuan32/simple-admin-message-center v1.6.0
github.com/zeromicro/go-zero v1.7.4
golang.org/x/oauth2 v0.24.0
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.2
Expand All @@ -41,7 +41,7 @@ require (
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.6 // indirect
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/inflect v0.21.0 // indirect
Expand All @@ -50,7 +50,7 @@ require (
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.22.1 // indirect
github.com/go-playground/validator/v10 v10.23.0 // indirect
github.com/go-sql-driver/mysql v1.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
Expand All @@ -61,8 +61,8 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgx/v5 v5.7.1 // indirect
Expand Down Expand Up @@ -118,14 +118,14 @@ require (
golang.org/x/text v0.20.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.27.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // 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
k8s.io/api v0.31.2 // indirect
k8s.io/apimachinery v0.31.2 // indirect
k8s.io/client-go v0.31.2 // indirect
k8s.io/api v0.31.3 // indirect
k8s.io/apimachinery v0.31.3 // indirect
k8s.io/client-go v0.31.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
Expand All @@ -134,6 +134,6 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace github.com/zeromicro/go-zero v1.7.3 => github.com/suyuan32/simple-admin-tools v1.7.3
replace github.com/zeromicro/go-zero v1.7.4 => github.com/suyuan32/simple-admin-tools v1.7.4

replace github.com/mojocn/base64Captcha v1.3.6 => github.com/suyuan32/base64Captcha v1.3.7
Loading

0 comments on commit b785516

Please sign in to comment.