Skip to content

Commit 5e3b150

Browse files
coderi421coderi421
committed
fix: update the mode
1 parent 6bcd8cb commit 5e3b150

File tree

3 files changed

+165
-1056
lines changed

3 files changed

+165
-1056
lines changed

‎gmicro/server/restserver/middlewares/auth/cache.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/dgrijalva/jwt-go"
7+
jwt "github.com/dgrijalva/jwt-go/v4"
88

99
"github.com/coderi421/gframework/gmicro/code"
1010
"github.com/coderi421/gframework/gmicro/server/restserver/middlewares"
1111
"github.com/coderi421/gframework/pkg/common/core"
12-
1312
"github.com/coderi421/gframework/pkg/errors"
1413

1514
"github.com/gin-gonic/gin"
@@ -83,7 +82,7 @@ func (cache CacheStrategy) AuthFunc() gin.HandlerFunc {
8382
}
8483

8584
return []byte(secret.Key), nil
86-
})
85+
}, jwt.WithAudience(AuthzAudience))
8786
if err != nil || !parsedT.Valid {
8887
core.WriteResponse(c, errors.WithCode(code.ErrSignatureInvalid, err.Error()), nil)
8988
c.Abort()

‎go.mod‎

Lines changed: 63 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,61 @@
1-
//nolint:unparam
21
module github.com/coderi421/gframework
32

43
go 1.19
54

65
require (
7-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
8-
github.com/bitly/go-simplejson v0.5.0
9-
github.com/dgrijalva/jwt-go v3.2.0+incompatible
10-
github.com/fatih/color v1.15.0
116
github.com/gin-gonic/gin v1.9.0
12-
github.com/go-kratos/kratos/v2 v2.6.2
13-
github.com/go-playground/locales v0.14.1
14-
github.com/go-playground/universal-translator v0.18.1
15-
github.com/go-playground/validator/v10 v10.11.2
16-
github.com/google/uuid v1.3.0
17-
github.com/gosuri/uitable v0.0.4
18-
github.com/h2non/filetype v1.1.3
19-
github.com/hashicorp/consul/api v1.18.0
20-
github.com/json-iterator/go v1.1.12
21-
github.com/moby/term v0.5.0
22-
github.com/pkg/errors v0.9.1
23-
github.com/sony/sonyflake v1.1.0
24-
github.com/speps/go-hashids v2.0.0+incompatible
25-
github.com/spf13/cobra v1.7.0
267
github.com/spf13/pflag v1.0.5
27-
github.com/spf13/viper v1.15.0
28-
github.com/stretchr/testify v1.8.2
29-
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.0
30-
go.opentelemetry.io/otel v1.15.1
31-
go.opentelemetry.io/otel/sdk v1.15.1
32-
go.opentelemetry.io/otel/trace v1.15.1
33-
go.uber.org/zap v1.24.0
34-
golang.org/x/crypto v0.5.0
35-
golang.org/x/sync v0.2.0
36-
golang.org/x/tools v0.7.0
37-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
38-
google.golang.org/grpc v1.55.0
39-
google.golang.org/protobuf v1.30.0
40-
gorm.io/gorm v1.25.1
41-
k8s.io/klog/v2 v2.100.1
42-
8+
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.1
9+
go.opentelemetry.io/otel v1.16.0
10+
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
11+
go.opentelemetry.io/otel/exporters/zipkin v1.16.0
12+
go.opentelemetry.io/otel/sdk v1.16.0
13+
go.opentelemetry.io/otel/trace v1.16.0
14+
go.uber.org/zap v1.21.0
4315
)
4416

4517
require (
18+
cloud.google.com/go v0.110.0 // indirect
19+
cloud.google.com/go/compute v1.18.0 // indirect
20+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
21+
cloud.google.com/go/firestore v1.9.0 // indirect
22+
cloud.google.com/go/longrunning v0.4.1 // indirect
4623
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
47-
github.com/appleboy/gin-jwt/v2 v2.9.1 // indirect
4824
github.com/armon/go-metrics v0.4.0 // indirect
4925
github.com/beorn7/perks v1.0.1 // indirect
5026
github.com/bits-and-blooms/bitset v1.2.0 // indirect
51-
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
5227
github.com/bytedance/sonic v1.8.0 // indirect
5328
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5429
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
30+
github.com/coreos/go-semver v0.3.0 // indirect
31+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
32+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
5533
github.com/davecgh/go-spew v1.1.1 // indirect
34+
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
35+
github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 // indirect
36+
github.com/fatih/color v1.15.0 // indirect
5637
github.com/fsnotify/fsnotify v1.6.0 // indirect
5738
github.com/gin-contrib/sse v0.1.0 // indirect
5839
github.com/go-kratos/aegis v0.2.0 // indirect
40+
github.com/go-kratos/kratos/v2 v2.6.2 // indirect
5941
github.com/go-logr/logr v1.2.4 // indirect
6042
github.com/go-logr/stdr v1.2.2 // indirect
6143
github.com/go-playground/form/v4 v4.2.0 // indirect
44+
github.com/go-playground/locales v0.14.1 // indirect
45+
github.com/go-playground/universal-translator v0.18.1 // indirect
46+
github.com/go-playground/validator/v10 v10.11.2 // indirect
6247
github.com/go-sql-driver/mysql v1.7.0 // indirect
6348
github.com/goccy/go-json v0.10.0 // indirect
64-
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
49+
github.com/gogo/protobuf v1.3.2 // indirect
50+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6551
github.com/golang/protobuf v1.5.3 // indirect
52+
github.com/google/go-cmp v0.5.9 // indirect
53+
github.com/google/uuid v1.3.0 // indirect
54+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
55+
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
6656
github.com/gorilla/mux v1.8.0 // indirect
57+
github.com/gosuri/uitable v0.0.4 // indirect
58+
github.com/hashicorp/consul/api v1.20.0 // indirect
6759
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
6860
github.com/hashicorp/go-hclog v1.2.0 // indirect
6961
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -74,44 +66,64 @@ require (
7466
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7567
github.com/jinzhu/inflection v1.0.0 // indirect
7668
github.com/jinzhu/now v1.1.5 // indirect
69+
github.com/json-iterator/go v1.1.12 // indirect
7770
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
7871
github.com/leodido/go-urn v1.2.1 // indirect
7972
github.com/magiconair/properties v1.8.7 // indirect
8073
github.com/mattn/go-colorable v0.1.13 // indirect
8174
github.com/mattn/go-isatty v0.0.17 // indirect
8275
github.com/mattn/go-runewidth v0.0.14 // indirect
83-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
76+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8477
github.com/mitchellh/go-homedir v1.1.0 // indirect
8578
github.com/mitchellh/mapstructure v1.5.0 // indirect
79+
github.com/moby/term v0.5.0 // indirect
8680
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8781
github.com/modern-go/reflect2 v1.0.2 // indirect
8882
github.com/openzipkin/zipkin-go v0.4.1 // indirect
8983
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
9084
github.com/penglongli/gin-metrics v0.1.10 // indirect
91-
github.com/pmezard/go-difflib v1.0.0 // indirect
92-
github.com/prometheus/client_golang v1.12.0 // indirect
93-
github.com/prometheus/client_model v0.2.0 // indirect
94-
github.com/prometheus/common v0.32.1 // indirect
95-
github.com/prometheus/procfs v0.7.3 // indirect
85+
github.com/pkg/errors v0.9.1 // indirect
86+
github.com/prometheus/client_golang v1.15.1 // indirect
87+
github.com/prometheus/client_model v0.3.0 // indirect
88+
github.com/prometheus/common v0.42.0 // indirect
89+
github.com/prometheus/procfs v0.9.0 // indirect
9690
github.com/rivo/uniseg v0.2.0 // indirect
91+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
92+
github.com/sagikazarmark/crypt v0.9.0 // indirect
9793
github.com/spf13/afero v1.9.3 // indirect
9894
github.com/spf13/cast v1.5.0 // indirect
95+
github.com/spf13/cobra v1.7.0 // indirect
9996
github.com/spf13/jwalterweatherman v1.1.0 // indirect
97+
github.com/spf13/viper v1.15.0 // indirect
10098
github.com/subosito/gotenv v1.4.2 // indirect
10199
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
102100
github.com/ugorji/go/codec v1.2.9 // indirect
103-
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.41.1 // indirect
104-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect
105-
go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
106-
go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect
107-
go.opentelemetry.io/otel/metric v0.38.1 // indirect
101+
go.etcd.io/etcd/api/v3 v3.5.6 // indirect
102+
go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
103+
go.etcd.io/etcd/client/v2 v2.305.6 // indirect
104+
go.etcd.io/etcd/client/v3 v3.5.6 // indirect
105+
go.opencensus.io v0.24.0 // indirect
106+
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.42.0 // indirect
107+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
108+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
108109
go.uber.org/atomic v1.9.0 // indirect
109110
go.uber.org/multierr v1.8.0 // indirect
110111
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
111-
golang.org/x/net v0.9.0 // indirect
112-
golang.org/x/sys v0.7.0 // indirect
112+
golang.org/x/crypto v0.5.0 // indirect
113+
golang.org/x/net v0.10.0 // indirect
114+
golang.org/x/oauth2 v0.6.0 // indirect
115+
golang.org/x/sync v0.1.0 // indirect
116+
golang.org/x/sys v0.8.0 // indirect
113117
golang.org/x/text v0.9.0 // indirect
118+
golang.org/x/time v0.1.0 // indirect
119+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
120+
google.golang.org/api v0.110.0 // indirect
121+
google.golang.org/appengine v1.6.7 // indirect
122+
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
123+
google.golang.org/grpc v1.55.0 // indirect
124+
google.golang.org/protobuf v1.30.0 // indirect
114125
gopkg.in/ini.v1 v1.67.0 // indirect
115126
gopkg.in/yaml.v3 v3.0.1 // indirect
116127
gorm.io/driver/mysql v1.5.1 // indirect
128+
gorm.io/gorm v1.25.1 // indirect
117129
)

0 commit comments

Comments
 (0)