Skip to content

Commit 8a92061

Browse files
wenjianzhangwenjianzhang
authored
Merge pull request #47 from go-admin-team/dev
Dev
2 parents 3c05e31 + 5d11954 commit 8a92061

20 files changed

+307
-167
lines changed

‎go.mod

+23-19
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ go 1.18
55
require (
66
github.com/BurntSushi/toml v0.3.1
77
github.com/bitly/go-simplejson v0.5.0
8-
github.com/bsm/redislock v0.5.0
9-
github.com/fsnotify/fsnotify v1.4.7
8+
github.com/bsm/redislock v0.8.2
9+
github.com/fsnotify/fsnotify v1.4.9
1010
github.com/ghodss/yaml v1.0.0
1111
github.com/gin-gonic/gin v1.7.7
12-
github.com/go-redis/redis/v7 v7.4.0
12+
github.com/go-admin-team/redisqueue/v2 v2.0.0
13+
github.com/go-redis/redis/v9 v9.0.0-rc.1
1314
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
1415
github.com/google/uuid v1.3.0
1516
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
@@ -19,62 +20,65 @@ require (
1920
github.com/nsqio/go-nsq v1.0.8
2021
github.com/pkg/errors v0.9.1
2122
github.com/prometheus/client_golang v1.11.0
22-
github.com/robinjoseph08/redisqueue/v2 v2.1.0
2323
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
2424
github.com/smartystreets/goconvey v1.6.4
2525
github.com/spf13/cast v1.3.1
26-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
26+
github.com/xuri/excelize/v2 v2.6.1
27+
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
2728
google.golang.org/grpc v1.29.1
28-
google.golang.org/protobuf v1.26.0-rc.1
29-
gorm.io/driver/mysql v1.3.5
30-
gorm.io/gorm v1.23.8
31-
gorm.io/plugin/dbresolver v1.2.2
29+
google.golang.org/protobuf v1.28.0
30+
gorm.io/driver/mysql v1.4.4
31+
gorm.io/gorm v1.24.2
32+
gorm.io/plugin/dbresolver v1.3.0
3233
)
3334

3435
require (
3536
github.com/beorn7/perks v1.0.1 // indirect
3637
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
37-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
38+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
39+
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
3840
github.com/fatih/color v1.7.0 // indirect
3941
github.com/gin-contrib/sse v0.1.0 // indirect
4042
github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f // indirect
4143
github.com/go-playground/locales v0.13.0 // indirect
4244
github.com/go-playground/universal-translator v0.17.0 // indirect
4345
github.com/go-playground/validator/v10 v10.4.1 // indirect
4446
github.com/go-sql-driver/mysql v1.6.0 // indirect
45-
github.com/golang/protobuf v1.4.3 // indirect
47+
github.com/golang/protobuf v1.5.2 // indirect
4648
github.com/golang/snappy v0.0.1 // indirect
4749
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
4850
github.com/jinzhu/inflection v1.0.0 // indirect
4951
github.com/jinzhu/now v1.1.5 // indirect
5052
github.com/jtolds/gls v4.20.0+incompatible // indirect
5153
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
52-
github.com/kr/pty v1.1.8 // indirect
5354
github.com/leodido/go-urn v1.2.0 // indirect
5455
github.com/mattn/go-colorable v0.1.7 // indirect
55-
github.com/mattn/go-isatty v0.0.14 // indirect
56+
github.com/mattn/go-isatty v0.0.12 // indirect
5657
github.com/mattn/goveralls v0.0.2 // indirect
5758
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
5859
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
5960
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6061
github.com/modern-go/reflect2 v1.0.1 // indirect
62+
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
6163
github.com/opentracing/opentracing-go v1.1.0 // indirect
6264
github.com/prometheus/client_model v0.2.0 // indirect
6365
github.com/prometheus/common v0.26.0 // indirect
6466
github.com/prometheus/procfs v0.6.0 // indirect
67+
github.com/richardlehane/mscfb v1.0.4 // indirect
68+
github.com/richardlehane/msoleps v1.0.3 // indirect
6569
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
66-
github.com/stretchr/testify v1.7.1 // indirect
6770
github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df // indirect
6871
github.com/ugorji/go/codec v1.1.7 // indirect
6972
github.com/urfave/cli v1.20.0 // indirect
70-
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
71-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
72-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
73+
github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
74+
github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
75+
golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 // indirect
76+
golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
77+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
7378
golang.org/x/text v0.3.7 // indirect
74-
golang.org/x/tools v0.0.0-20210106214847-113979e3529a // indirect
79+
golang.org/x/tools v0.1.12 // indirect
7580
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
7681
gopkg.in/AlecAivazis/survey.v1 v1.8.5 // indirect
7782
gopkg.in/kyokomi/emoji.v1 v1.5.1 // indirect
7883
gopkg.in/yaml.v2 v2.4.0 // indirect
79-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
8084
)

‎sdk/config/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ func (e *Settings) runCallback() {
2727

2828
func (e *Settings) OnChange() {
2929
e.init()
30-
log.Println("!!! config change and reload")
30+
log.Println("config change and reload")
3131
}
3232

3333
func (e *Settings) Init() {
3434
e.init()
35-
log.Println("!!! config init")
35+
log.Println("config init")
3636
}
3737

3838
func (e *Settings) init() {

‎sdk/config/locker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package config
33
import (
44
"github.com/go-admin-team/go-admin-core/storage"
55
"github.com/go-admin-team/go-admin-core/storage/locker"
6-
"github.com/go-redis/redis/v7"
6+
"github.com/go-redis/redis/v9"
77
)
88

99
var LockerConfig = new(Locker)

‎sdk/config/option_redis.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package config
22

33
import (
4+
"context"
45
"crypto/tls"
56
"crypto/x509"
67
"fmt"
78
"io/ioutil"
89

9-
"github.com/go-redis/redis/v7"
10+
"github.com/go-redis/redis/v9"
1011
)
1112

1213
var _redis *redis.Client
@@ -19,7 +20,7 @@ func GetRedisClient() *redis.Client {
1920
// SetRedisClient 设置redis客户端
2021
func SetRedisClient(c *redis.Client) {
2122
if _redis != nil && _redis != c {
22-
_redis.Shutdown()
23+
_redis.Shutdown(context.TODO())
2324
}
2425
_redis = c
2526
}

‎sdk/config/queue.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package config
33
import (
44
"github.com/go-admin-team/go-admin-core/storage"
55
"github.com/go-admin-team/go-admin-core/storage/queue"
6-
"github.com/go-redis/redis/v7"
7-
"github.com/robinjoseph08/redisqueue/v2"
6+
"github.com/go-admin-team/redisqueue/v2"
7+
"github.com/go-redis/redis/v9"
88
"time"
99
)
1010

‎sdk/go.mod

+30-33
Original file line numberDiff line numberDiff line change
@@ -3,78 +3,79 @@ module github.com/go-admin-team/go-admin-core/sdk
33
go 1.18
44

55
require (
6-
github.com/bsm/redislock v0.5.0
6+
github.com/bsm/redislock v0.8.2
77
github.com/bytedance/go-tagexpr/v2 v2.7.12
8-
github.com/casbin/casbin/v2 v2.47.2
9-
github.com/casbin/redis-watcher/v2 v2.0.0-20220614104201-0e70bf2be930
8+
github.com/casbin/casbin/v2 v2.54.0
109
github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd
11-
github.com/gin-gonic/gin v1.7.3
12-
github.com/go-admin-team/go-admin-core v1.3.11
10+
github.com/gin-gonic/gin v1.7.7
11+
github.com/go-admin-team/go-admin-core v1.3.12-0.20221121065133-27b7dbe27a8f
1312
github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210610020726-2db73adb505d
14-
github.com/go-admin-team/gorm-adapter/v3 v3.7.8-0.20220809100335-eaf9f67b3d21
13+
github.com/go-admin-team/gorm-adapter/v3 v3.2.1-0.20210902112335-4148cb356a24
14+
github.com/go-admin-team/redis-watcher/v2 v2.0.0-20221121052608-058cebff72c2
15+
github.com/go-admin-team/redisqueue/v2 v2.0.0-20221119141731-97c556b0d5b7
1516
github.com/go-playground/locales v0.13.0
1617
github.com/go-playground/universal-translator v0.17.0
1718
github.com/go-playground/validator/v10 v10.4.1
18-
github.com/go-redis/redis/v7 v7.4.0
19-
github.com/go-redis/redis/v8 v8.11.5
19+
github.com/go-redis/redis/v9 v9.0.0-rc.1
2020
github.com/golang-jwt/jwt/v4 v4.4.2
2121
github.com/google/uuid v1.3.0
2222
github.com/gorilla/websocket v1.4.2
2323
github.com/mojocn/base64Captcha v1.3.1
2424
github.com/nsqio/go-nsq v1.0.8
2525
github.com/robfig/cron/v3 v3.0.1
26-
github.com/robinjoseph08/redisqueue/v2 v2.1.0
2726
github.com/shamsher31/goimgext v1.0.0
2827
github.com/slok/go-http-metrics v0.9.0
2928
github.com/smartystreets/goconvey v1.6.4
30-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
31-
gorm.io/gorm v1.23.8
29+
golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b
30+
gorm.io/gorm v1.24.2
3231
)
3332

3433
require (
3534
github.com/BurntSushi/toml v0.3.1 // indirect
3635
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
3736
github.com/beorn7/perks v1.0.1 // indirect
3837
github.com/bitly/go-simplejson v0.5.0 // indirect
38+
github.com/casbin/redis-watcher/v2 v2.3.0 // indirect
3939
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4040
github.com/chanxuehong/rand v0.0.0-20201110082127-2f19a1bdd973 // indirect
41-
github.com/denisenkom/go-mssqldb v0.12.0 // indirect
4241
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
4342
github.com/fatih/color v1.7.0 // indirect
4443
github.com/fsnotify/fsnotify v1.4.9 // indirect
4544
github.com/ghodss/yaml v1.0.0 // indirect
4645
github.com/gin-contrib/sse v0.1.0 // indirect
4746
github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f // indirect
47+
github.com/go-redis/redis/v8 v8.11.5 // indirect
4848
github.com/go-sql-driver/mysql v1.6.0 // indirect
4949
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
50-
github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 // indirect
50+
github.com/golang-sql/sqlexp v0.1.0 // indirect
5151
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
52-
github.com/golang/protobuf v1.4.3 // indirect
52+
github.com/golang/protobuf v1.5.2 // indirect
5353
github.com/golang/snappy v0.0.1 // indirect
5454
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
5555
github.com/henrylee2cn/ameda v1.4.10 // indirect
5656
github.com/henrylee2cn/goutil v0.0.0-20210127050712-89660552f6f8 // indirect
5757
github.com/imdario/mergo v0.3.9 // indirect
5858
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
59-
github.com/jackc/pgconn v1.11.0 // indirect
59+
github.com/jackc/pgconn v1.13.0 // indirect
6060
github.com/jackc/pgio v1.0.0 // indirect
6161
github.com/jackc/pgpassfile v1.0.0 // indirect
62-
github.com/jackc/pgproto3/v2 v2.2.0 // indirect
62+
github.com/jackc/pgproto3/v2 v2.3.1 // indirect
6363
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
64-
github.com/jackc/pgtype v1.10.0 // indirect
65-
github.com/jackc/pgx/v4 v4.15.0 // indirect
64+
github.com/jackc/pgtype v1.12.0 // indirect
65+
github.com/jackc/pgx/v4 v4.17.2 // indirect
6666
github.com/jinzhu/inflection v1.0.0 // indirect
6767
github.com/jinzhu/now v1.1.5 // indirect
6868
github.com/json-iterator/go v1.1.11 // indirect
6969
github.com/jtolds/gls v4.20.0+incompatible // indirect
7070
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
7171
github.com/leodido/go-urn v1.2.0 // indirect
7272
github.com/mattn/go-colorable v0.1.7 // indirect
73-
github.com/mattn/go-isatty v0.0.14 // indirect
74-
github.com/mattn/go-sqlite3 v1.14.12 // indirect
73+
github.com/mattn/go-isatty v0.0.12 // indirect
74+
github.com/mattn/go-sqlite3 v1.14.15 // indirect
7575
github.com/mattn/goveralls v0.0.2 // indirect
7676
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
7777
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
78+
github.com/microsoft/go-mssqldb v0.17.0 // indirect
7879
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7980
github.com/modern-go/reflect2 v1.0.1 // indirect
8081
github.com/nyaruka/phonenumbers v1.0.55 // indirect
@@ -91,23 +92,19 @@ require (
9192
go.uber.org/atomic v1.6.0 // indirect
9293
go.uber.org/multierr v1.5.0 // indirect
9394
go.uber.org/zap v1.13.0 // indirect
94-
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
95+
golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 // indirect
9596
golang.org/x/lint v0.0.0-20190930215403-16217165b5de // indirect
96-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
97+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
9798
golang.org/x/text v0.3.7 // indirect
98-
golang.org/x/tools v0.0.0-20210106214847-113979e3529a // indirect
99-
google.golang.org/protobuf v1.26.0-rc.1 // indirect
99+
golang.org/x/tools v0.1.12 // indirect
100+
google.golang.org/protobuf v1.28.0 // indirect
100101
gopkg.in/AlecAivazis/survey.v1 v1.8.5 // indirect
101102
gopkg.in/kyokomi/emoji.v1 v1.5.1 // indirect
102103
gopkg.in/yaml.v2 v2.4.0 // indirect
103-
gorm.io/driver/mysql v1.3.5 // indirect
104-
gorm.io/driver/postgres v1.3.4 // indirect
105-
gorm.io/driver/sqlite v1.3.6 // indirect
106-
gorm.io/driver/sqlserver v1.3.2 // indirect
107-
gorm.io/plugin/dbresolver v1.2.2 // indirect
104+
gorm.io/driver/mysql v1.4.4 // indirect
105+
gorm.io/driver/postgres v1.4.5 // indirect
106+
gorm.io/driver/sqlite v1.4.3 // indirect
107+
gorm.io/driver/sqlserver v1.4.1 // indirect
108108
)
109109

110-
//replace (
111-
// github.com/go-admin-team/go-admin-core => ../
112-
// github.com/go-admin-team/go-admin-core/plugins/logger/zap => ../plugins/logger/zap
113-
//)
110+
//replace github.com/go-admin-team/go-admin-core => ../

‎sdk/pkg/casbin/mycasbin.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"github.com/casbin/casbin/v2"
77
"github.com/casbin/casbin/v2/log"
88
"github.com/casbin/casbin/v2/model"
9-
redisWatcher "github.com/casbin/redis-watcher/v2"
109
"github.com/go-admin-team/go-admin-core/logger"
1110
"github.com/go-admin-team/go-admin-core/sdk"
1211
"github.com/go-admin-team/go-admin-core/sdk/config"
13-
"github.com/go-redis/redis/v8"
12+
redisWatcher "github.com/go-admin-team/redis-watcher/v2"
13+
"github.com/go-redis/redis/v9"
1414
"gorm.io/gorm"
1515

1616
gormAdapter "github.com/go-admin-team/gorm-adapter/v3"

‎sdk/pkg/cronjob/gadmjob.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/robfig/cron/v3"
55
)
66

7-
// NewWithSeconds newWithSeconds returns a Cron with the seconds field enabled.
7+
// NewWithSeconds returns a Cron with the seconds field enabled.
88
func NewWithSeconds() *cron.Cron {
99
secondParser := cron.NewParser(cron.Second | cron.Minute |
1010
cron.Hour | cron.Dom | cron.Month | cron.DowOptional | cron.Descriptor)

0 commit comments

Comments
 (0)