Merge pull request #271 from suyuan32/dev

chore: upgrade deps

api/core.go

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

core.json

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

go.mod

@@ -3,19 +3,19 @@ module github.com/suyuan32/simple-admin-core
 go 1.21.0
 
 require (
- entgo.io/ent v0.13.0
+ 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/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.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
+ 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/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
 )
 
@@ -41,10 +41,10 @@ require (
  github.com/go-openapi/inflect v0.19.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.3 // 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.18.0 // indirect
+ github.com/go-playground/validator/v10 v10.19.0 // indirect
  github.com/go-sql-driver/mysql v1.7.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
@@ -73,7 +73,6 @@ require (
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.20 // indirect
  github.com/mattn/go-sqlite3 v1.14.22 // indirect
- github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
  github.com/mitchellh/go-wordwrap v1.0.1 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -82,42 +81,41 @@ require (
  github.com/openzipkin/zipkin-go v0.4.2 // indirect
  github.com/pelletier/go-toml/v2 v2.1.1 // indirect
  github.com/pkg/errors v0.9.1 // indirect
- github.com/prometheus/client_golang v1.18.0 // indirect
+ github.com/prometheus/client_golang v1.19.0 // indirect
  github.com/prometheus/client_model v0.5.0 // indirect
- github.com/prometheus/common v0.45.0 // indirect
+ 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
  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
- go.opentelemetry.io/otel v1.23.1 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.1 // indirect
- go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.1 // indirect
- go.opentelemetry.io/otel/exporters/zipkin v1.23.1 // indirect
- go.opentelemetry.io/otel/metric v1.23.1 // indirect
- go.opentelemetry.io/otel/sdk v1.23.1 // indirect
- go.opentelemetry.io/otel/trace v1.23.1 // indirect
+ go.opentelemetry.io/otel v1.24.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
+ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
+ go.opentelemetry.io/otel/exporters/zipkin v1.24.0 // indirect
+ go.opentelemetry.io/otel/metric v1.24.0 // indirect
+ 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/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.19.0 // indirect
+ golang.org/x/crypto v0.21.0 // indirect
  golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
- golang.org/x/image v0.13.0 // indirect
- golang.org/x/mod v0.14.0 // indirect
- golang.org/x/net v0.21.0 // indirect
- golang.org/x/sys v0.17.0 // indirect
- golang.org/x/term v0.17.0 // indirect
+ golang.org/x/image v0.15.0 // indirect
+ golang.org/x/mod v0.15.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
  google.golang.org/appengine v1.6.8 // 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
+ google.golang.org/genproto/googleapis/api v0.0.0-20240228224816-df926f6c8641 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // 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 +130,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.7
+replace github.com/zeromicro/go-zero v1.6.3 => github.com/suyuan32/simple-admin-tools v1.6.8