Merge pull request #276 from suyuan32/dev

chore: upgrade deps

api/core.go

@@ -5,7 +5,7 @@
 // Schemes: http, https
 // Host: localhost:9100
 // BasePath: /
-// Version: 1.3.10
+// Version: 1.3.11
 // Contact: yuansu.china.work@gmail.com
 // SecurityDefinitions:
 // Token:

core.json

@@ -16,7 +16,7 @@
  "contact": {
  "email": "yuansu.china.work@gmail.com"
  },
- "version": "1.3.10"
+ "version": "1.3.11"
  },
  "host": "localhost:9100",
  "basePath": "/",

go.mod

@@ -1,31 +1,32 @@
 module github.com/suyuan32/simple-admin-core
 
-go 1.21.0
+go 1.22.0
 
 require (
  entgo.io/ent v0.13.1
  github.com/bsm/redislock v0.9.4
- github.com/casbin/casbin/v2 v2.82.0
- github.com/duke-git/lancet/v2 v2.2.9
+ github.com/casbin/casbin/v2 v2.85.0
+ github.com/duke-git/lancet/v2 v2.3.0
  github.com/gofrs/uuid/v5 v5.0.0
  github.com/mojocn/base64Captcha v1.3.6
  github.com/redis/go-redis/v9 v9.5.1
- github.com/suyuan32/simple-admin-common v1.3.10
- github.com/suyuan32/simple-admin-job v1.3.10
- github.com/suyuan32/simple-admin-message-center v1.3.10
+ github.com/suyuan32/simple-admin-common v1.3.11
+ github.com/suyuan32/simple-admin-job v1.3.11
+ github.com/suyuan32/simple-admin-message-center v1.3.11
  github.com/zeromicro/go-zero v1.6.3
  golang.org/x/oauth2 v0.18.0
- google.golang.org/grpc v1.62.0
- google.golang.org/protobuf v1.32.0
+ google.golang.org/grpc v1.62.1
+ google.golang.org/protobuf v1.33.0
 )
 
 require (
- ariga.io/atlas v0.19.1-0.20240203083654-5948b60a8e43 // indirect
+ ariga.io/atlas v0.19.2 // indirect
+ filippo.io/edwards25519 v1.1.0 // indirect
  github.com/agext/levenshtein v1.2.3 // indirect
- github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+ github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/casbin/ent-adapter v0.3.0 // indirect
- github.com/casbin/govaluate v1.1.0 // indirect
+ github.com/casbin/govaluate v1.1.1 // indirect
  github.com/casbin/redis-watcher/v2 v2.5.0 // indirect
  github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -38,33 +39,33 @@ require (
  github.com/gabriel-vasile/mimetype v1.4.3 // indirect
  github.com/go-logr/logr v1.4.1 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
- github.com/go-openapi/inflect v0.19.0 // indirect
+ github.com/go-openapi/inflect v0.21.0 // indirect
  github.com/go-openapi/jsonpointer v0.19.6 // indirect
  github.com/go-openapi/jsonreference v0.20.2 // indirect
  github.com/go-openapi/swag v0.22.4 // 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.19.0 // indirect
- github.com/go-sql-driver/mysql v1.7.1 // indirect
+ github.com/go-sql-driver/mysql v1.8.0 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+ github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
  github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
  github.com/golang/mock v1.6.0 // indirect
- github.com/golang/protobuf v1.5.3 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
  github.com/google/gnostic-models v0.6.8 // indirect
  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.19.0 // indirect
- github.com/hashicorp/hcl/v2 v2.16.2 // indirect
+ github.com/hashicorp/hcl/v2 v2.20.0 // indirect
  github.com/jackc/chunkreader/v2 v2.0.1 // indirect
- github.com/jackc/pgconn v1.14.0 // indirect
+ github.com/jackc/pgconn v1.14.3 // indirect
  github.com/jackc/pgio v1.0.0 // indirect
  github.com/jackc/pgpassfile v1.0.0 // indirect
- github.com/jackc/pgproto3/v2 v2.3.2 // indirect
- github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
- github.com/jackc/pgtype v1.14.0 // indirect
- github.com/jackc/pgx/v4 v4.18.1 // indirect
+ github.com/jackc/pgproto3/v2 v2.3.3 // indirect
+ github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
+ github.com/jackc/pgtype v1.14.2 // indirect
+ github.com/jackc/pgx/v4 v4.18.3 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/leodido/go-urn v1.4.0 // indirect
@@ -86,7 +87,7 @@ require (
  github.com/prometheus/common v0.48.0 // indirect
  github.com/prometheus/procfs v0.12.0 // indirect
  github.com/spaolacci/murmur3 v1.1.0 // indirect
- github.com/zclconf/go-cty v1.13.1 // indirect
+ github.com/zclconf/go-cty v1.14.3 // indirect
  go.etcd.io/etcd/api/v3 v3.5.12 // indirect
  go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
  go.etcd.io/etcd/client/v3 v3.5.12 // indirect
@@ -100,34 +101,37 @@ require (
  go.opentelemetry.io/otel/sdk v1.24.0 // indirect
  go.opentelemetry.io/otel/trace v1.24.0 // indirect
  go.opentelemetry.io/proto/otlp v1.1.0 // indirect
- go.uber.org/atomic v1.10.0 // indirect
+ go.uber.org/atomic v1.11.0 // indirect
  go.uber.org/automaxprocs v1.5.3 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  go.uber.org/zap v1.24.0 // indirect
  golang.org/x/crypto v0.21.0 // indirect
- golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
+ golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
  golang.org/x/image v0.15.0 // indirect
- golang.org/x/mod v0.15.0 // indirect
+ golang.org/x/mod v0.16.0 // indirect
  golang.org/x/net v0.22.0 // indirect
  golang.org/x/sys v0.18.0 // indirect
  golang.org/x/term v0.18.0 // indirect
  golang.org/x/text v0.14.0 // indirect
  golang.org/x/time v0.5.0 // indirect
+ golang.org/x/tools v0.19.0 // indirect
  google.golang.org/appengine v1.6.8 // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20240228224816-df926f6c8641 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // 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.29.2 // indirect
- k8s.io/apimachinery v0.29.2 // indirect
- k8s.io/client-go v0.29.2 // indirect
+ k8s.io/api v0.29.3 // indirect
+ k8s.io/apimachinery v0.29.3 // indirect
+ k8s.io/client-go v0.29.3 // indirect
  k8s.io/klog/v2 v2.110.1 // indirect
  k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
- k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
+ k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
  sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
  sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
  sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace github.com/zeromicro/go-zero v1.6.3 => github.com/suyuan32/simple-admin-tools v1.6.8
+replace github.com/zeromicro/go-zero v1.6.3 => github.com/suyuan32/simple-admin-tools v1.6.9
+
+replace github.com/mojocn/base64Captcha v1.3.6 => github.com/suyuan32/base64Captcha v1.3.7