Merge branch 'hotfix'

zhangqian

2023-08-24 d7aa0c40191ac24bdf7c546bbed52066a61e2033

 go.mod

@@ -3,9 +3,9 @@
go 1.20

require (
   github.com/casbin/casbin/v2 v2.68.0
   github.com/casbin/gorm-adapter/v3 v3.7.3
   github.com/flipped-aurora/gin-vue-admin/server v0.0.0-20230711142447-66d119bef3a6
   github.com/casbin/casbin/v2 v2.73.0
   github.com/casbin/gorm-adapter/v3 v3.18.0
   github.com/flipped-aurora/gin-vue-admin/server v0.0.0-20230806074802-16c79bbc641f
   github.com/gin-contrib/cors v1.4.0
   github.com/gin-gonic/gin v1.9.1
   github.com/go-redis/redis/v8 v8.11.5
@@ -16,7 +16,9 @@
   github.com/mojocn/base64Captcha v1.3.5
   github.com/pkg/errors v0.9.1
   github.com/robfig/cron/v3 v3.0.1
   github.com/shopspring/decimal v1.3.1
   github.com/songzhibin97/gkit v1.2.11
   github.com/spf13/cast v1.5.1
   github.com/spf13/viper v1.16.0
   github.com/stretchr/testify v1.8.4
   github.com/swaggo/files v1.0.1
@@ -24,14 +26,16 @@
   github.com/swaggo/swag v1.16.1
   go.etcd.io/etcd/client/pkg/v3 v3.5.9
   go.etcd.io/etcd/client/v3 v3.5.9
   go.uber.org/zap v1.24.0
   golang.org/x/crypto v0.10.0
   go.uber.org/zap v1.25.0
   golang.org/x/crypto v0.12.0
   golang.org/x/sync v0.3.0
   gopkg.in/natefinch/lumberjack.v2 v2.2.1
   gorm.io/driver/mysql v1.5.1
   gorm.io/gorm v1.25.1
   gorm.io/gorm v1.25.2
   moul.io/zapgorm2 v1.3.0
)

require google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect

require (
   github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
@@ -57,6 +61,7 @@
   github.com/go-playground/universal-translator v0.18.1 // indirect
   github.com/go-playground/validator/v10 v10.14.0 // indirect
   github.com/goccy/go-json v0.10.2 // indirect
   github.com/gofrs/uuid/v5 v5.0.0 // indirect
   github.com/gogo/protobuf v1.3.2 // indirect
   github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
   github.com/golang-sql/sqlexp v0.1.0 // indirect
@@ -80,30 +85,31 @@
   github.com/mitchellh/mapstructure v1.5.0 // indirect
   github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
   github.com/modern-go/reflect2 v1.0.2 // indirect
   github.com/onsi/gomega v1.27.4 // indirect
   github.com/pelletier/go-toml/v2 v2.0.8 // indirect
   github.com/pmezard/go-difflib v1.0.0 // indirect
   github.com/redis/go-redis/v9 v9.0.5 // indirect
   github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
   github.com/rogpeppe/go-internal v1.10.0 // indirect
   github.com/spf13/afero v1.9.5 // indirect
   github.com/spf13/cast v1.5.1 // indirect
   github.com/spf13/jwalterweatherman v1.1.0 // indirect
   github.com/spf13/pflag v1.0.5 // indirect
   github.com/subosito/gotenv v1.4.2 // indirect
   github.com/tidwall/gjson v1.14.4 // indirect
   github.com/tidwall/match v1.1.1 // indirect
   github.com/tidwall/pretty v1.2.0 // indirect
   github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
   github.com/ugorji/go/codec v1.2.11 // indirect
   go.etcd.io/etcd/api/v3 v3.5.9 // indirect
   go.uber.org/atomic v1.9.0 // indirect
   go.uber.org/multierr v1.8.0 // indirect
   go.uber.org/multierr v1.10.0 // indirect
   golang.org/x/arch v0.3.0 // indirect
   golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
   golang.org/x/net v0.10.0 // indirect
   golang.org/x/sys v0.9.0 // indirect
   golang.org/x/text v0.10.0 // indirect
   golang.org/x/image v0.5.0 // indirect
   golang.org/x/net v0.14.0 // indirect
   golang.org/x/sys v0.11.0 // indirect
   golang.org/x/text v0.12.0 // indirect
   golang.org/x/tools v0.9.1 // indirect
   google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
   google.golang.org/grpc v1.55.0 // indirect
   google.golang.org/protobuf v1.30.0 // indirect
   google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
   google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
   google.golang.org/grpc v1.57.0
   google.golang.org/protobuf v1.31.0
   gopkg.in/ini.v1 v1.67.0 // indirect
   gopkg.in/yaml.v3 v3.0.1 // indirect
   gorm.io/driver/postgres v1.5.2 // indirect