diff --git a/go.mod b/go.mod index 83413122..9559d195 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( gitee.com/chunanyong/zorm v1.5.5 github.com/aliyun/aliyun-oss-go-sdk v2.2.4+incompatible github.com/allegro/bigcache/v3 v3.0.2 - github.com/aws/aws-sdk-go v1.44.48 + github.com/aws/aws-sdk-go v1.44.49 github.com/baidubce/bce-sdk-go v0.9.127 github.com/basgys/goxml2json v1.1.0 github.com/beego/beego/v2 v2.0.4 @@ -26,7 +26,7 @@ require ( github.com/nilorg/sdk v0.0.0-20220617065147-3001fb840741 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/qiniu/go-sdk/v7 v7.13.0 - github.com/qiniu/qmgo v1.1.0 + github.com/qiniu/qmgo v1.1.1 github.com/robfig/cron/v3 v3.0.1 github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda github.com/shopspring/decimal v1.3.1 @@ -103,11 +103,11 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect - golang.org/x/net v0.0.0-20220630215102-69896b714898 // indirect + golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 // indirect golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect - google.golang.org/genproto v0.0.0-20220630174209-ad1d48641aa7 // indirect + google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 70d95c97..64476ca8 100644 --- a/go.sum +++ b/go.sum @@ -39,13 +39,11 @@ github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQ github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= -github.com/aws/aws-sdk-go v1.44.47 h1:uyiNvoR4wfZ8Bp4ghgbyzGFIg5knjZMUAd5S9ba9qNU= -github.com/aws/aws-sdk-go v1.44.47/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.48 h1:jLDC9RsNoYMLFlKpB8LdqUnoDdC2yvkS4QbuyPQJ8+M= github.com/aws/aws-sdk-go v1.44.48/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.49 h1:6+xYbAqqbY55hPZ+dwDZ/JolN6lzZPRvVvCcAa8y6iw= +github.com/aws/aws-sdk-go v1.44.49/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/baidubce/bce-sdk-go v0.9.126 h1:wrpb94AN8gLtuGr3wfEm0DObrNulX3W13MeG3lo9SRg= -github.com/baidubce/bce-sdk-go v0.9.126/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg= github.com/baidubce/bce-sdk-go v0.9.127 h1:0CDJRx4APf735rCAGIkcI1ExTIF5MtUJD7mvQ1M7sm0= github.com/baidubce/bce-sdk-go v0.9.127/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA= @@ -522,6 +520,8 @@ github.com/qiniu/go-sdk/v7 v7.13.0 h1:0bWRh/oAC2cArUILZLuWN+s9hPep1JYch5sA2Mfxq7 github.com/qiniu/go-sdk/v7 v7.13.0/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w= github.com/qiniu/qmgo v1.1.0 h1:+OwUQQ6pAFAaE/nyN0k4p7+WDy2ezuGz0itkYBbpzHk= github.com/qiniu/qmgo v1.1.0/go.mod h1:gTj5P+fOyGwtTkumPa8YTFspsf0Ndpw+MtRPwU1FHL4= +github.com/qiniu/qmgo v1.1.1 h1:flz0h/524mAOjlpU3ahliyL7v5JfHmw4NqKmqcV4plo= +github.com/qiniu/qmgo v1.1.1/go.mod h1:gTj5P+fOyGwtTkumPa8YTFspsf0Ndpw+MtRPwU1FHL4= github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= @@ -722,6 +722,8 @@ golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220630215102-69896b714898 h1:K7wO6V1IrczY9QOQ2WkVpw4JQSwCd52UsxVEirZUfiw= golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 h1:8NSylCMxLW4JvserAndSgFL7aPli6A68yf0bYFTcWCM= +golang.org/x/net v0.0.0-20220706163947-c90051bbdb60/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -778,8 +780,6 @@ golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220702020025-31831981b65f h1:xdsejrW/0Wf2diT5CPp3XmKUNbr7Xvw8kYilQ+6qjRY= -golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -843,6 +843,8 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20220630174209-ad1d48641aa7 h1:q4zUJDd0+knPFB9x20S3vnxzlYNBbt8Yd7zBMVMteeM= google.golang.org/genproto v0.0.0-20220630174209-ad1d48641aa7/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 h1:7YDGQC/0sigNGzsEWyb9s72jTxlFdwVEYNJHbfQ+Dtg= +google.golang.org/genproto v0.0.0-20220706185917-7780775163c4/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -916,8 +918,6 @@ gorm.io/driver/mysql v1.3.2/go.mod h1:ChK6AHbHgDCFZyJp0F+BmVGb06PSIoh9uVYKAlRbb2 gorm.io/driver/mysql v1.3.4 h1:/KoBMgsUHC3bExsekDcmNYaBnfH2WNeFuXqqrqMc98Q= gorm.io/driver/mysql v1.3.4/go.mod h1:s4Tq0KmD0yhPGHbZEwg1VPlH0vT/GBHJZorPzhcxBUE= gorm.io/driver/postgres v1.3.4/go.mod h1:y0vEuInFKJtijuSGu9e5bs5hzzSzPK+LancpKpvbRBw= -gorm.io/driver/postgres v1.3.7 h1:FKF6sIMDHDEvvMF/XJvbnCl0nu6KSKUaPXevJ4r+VYQ= -gorm.io/driver/postgres v1.3.7/go.mod h1:f02ympjIcgtHEGFMZvdgTxODZ9snAHDb4hXfigBVuNI= gorm.io/driver/postgres v1.3.8 h1:8bEphSAB69t3odsCR4NDzt581iZEWQuRM27Cg6KgfPY= gorm.io/driver/postgres v1.3.8/go.mod h1:qB98Aj6AhRO/oyu/jmZsi/YM9g6UzVCjMxO/6frFvcA= gorm.io/driver/sqlite v1.3.1 h1:bwfE+zTEWklBYoEodIOIBwuWHpnx52Z9zJFW5F33WLk= diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index 4c80047d..afc5ddab 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.44.48" +const SDKVersion = "1.44.49" diff --git a/vendor/github.com/qiniu/qmgo/README.md b/vendor/github.com/qiniu/qmgo/README.md index d0f97bbb..718a31ad 100644 --- a/vendor/github.com/qiniu/qmgo/README.md +++ b/vendor/github.com/qiniu/qmgo/README.md @@ -97,7 +97,7 @@ Or Create index ```go - cli.CreateOneIndex(context.Background(), options.IndexModel{Key: []string{"name"}, Unique: true}) + cli.CreateOneIndex(context.Background(), options.IndexModel{Key: []string{"name"}}) cli.CreateIndexes(context.Background(), []options.IndexModel{{Key: []string{"id2", "id3"}}}) ``` diff --git a/vendor/github.com/qiniu/qmgo/README_ZH.md b/vendor/github.com/qiniu/qmgo/README_ZH.md index 4da34219..a747a045 100644 --- a/vendor/github.com/qiniu/qmgo/README_ZH.md +++ b/vendor/github.com/qiniu/qmgo/README_ZH.md @@ -93,7 +93,7 @@ go get github.com/qiniu/qmgo 创建索引 ```go - cli.CreateOneIndex(context.Background(), options.IndexModel{Key: []string{"name"}, Unique: true}) + cli.CreateOneIndex(context.Background(), options.IndexModel{Key: []string{"name"}}) cli.CreateIndexes(context.Background(), []options.IndexModel{{Key: []string{"id2", "id3"}}}) ``` diff --git a/vendor/github.com/qiniu/qmgo/interface.go b/vendor/github.com/qiniu/qmgo/interface.go index 8910c53e..f04e3583 100644 --- a/vendor/github.com/qiniu/qmgo/interface.go +++ b/vendor/github.com/qiniu/qmgo/interface.go @@ -52,10 +52,12 @@ type QueryI interface { Select(selector interface{}) QueryI Skip(n int64) QueryI BatchSize(n int64) QueryI + NoCursorTimeout(n bool) QueryI Limit(n int64) QueryI One(result interface{}) error All(result interface{}) error Count() (n int64, err error) + EstimatedCount() (n int64, err error) Distinct(key string, result interface{}) error Cursor() CursorI Apply(change Change, result interface{}) error diff --git a/vendor/github.com/qiniu/qmgo/query.go b/vendor/github.com/qiniu/qmgo/query.go index ca1f5e1a..53c4bb93 100644 --- a/vendor/github.com/qiniu/qmgo/query.go +++ b/vendor/github.com/qiniu/qmgo/query.go @@ -29,13 +29,14 @@ import ( // Query struct definition type Query struct { - filter interface{} - sort interface{} - project interface{} - hint interface{} - limit *int64 - skip *int64 - batchSize *int64 + filter interface{} + sort interface{} + project interface{} + hint interface{} + limit *int64 + skip *int64 + batchSize *int64 + noCursorTimeout *bool ctx context.Context collection *mongo.Collection @@ -43,6 +44,12 @@ type Query struct { registry *bsoncodec.Registry } +func (q *Query) NoCursorTimeout(n bool) QueryI { + newQ := q + newQ.noCursorTimeout = &n + return newQ +} + // BatchSize sets the value for the BatchSize field. // Means the maximum number of documents to be included in each batch returned by the server. func (q *Query) BatchSize(n int64) QueryI { @@ -174,6 +181,9 @@ func (q *Query) All(result interface{}) error { if q.batchSize != nil { opt.SetBatchSize(int32(*q.batchSize)) } + if q.noCursorTimeout != nil { + opt.SetNoCursorTimeout(*q.noCursorTimeout) + } var err error var cursor *mongo.Cursor @@ -211,6 +221,11 @@ func (q *Query) Count() (n int64, err error) { return q.collection.CountDocuments(q.ctx, q.filter, opt) } +// EstimatedCount count the number of the collection by using the metadata +func (q *Query) EstimatedCount() (n int64, err error) { + return q.collection.EstimatedDocumentCount(q.ctx) +} + // Distinct gets the unique value of the specified field in the collection and return it in the form of slice // result should be passed a pointer to slice // The function will verify whether the static type of the elements in the result slice is consistent with the data type obtained in mongodb @@ -273,6 +288,9 @@ func (q *Query) Cursor() CursorI { if q.batchSize != nil { opt.SetBatchSize(int32(*q.batchSize)) } + if q.noCursorTimeout != nil { + opt.SetNoCursorTimeout(*q.noCursorTimeout) + } var err error var cur *mongo.Cursor diff --git a/vendor/modules.txt b/vendor/modules.txt index 8aa9921a..d0e94145 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -9,7 +9,7 @@ github.com/aliyun/aliyun-oss-go-sdk/oss ## explicit; go 1.16 github.com/allegro/bigcache/v3 github.com/allegro/bigcache/v3/queue -# github.com/aws/aws-sdk-go v1.44.48 +# github.com/aws/aws-sdk-go v1.44.49 ## explicit; go 1.11 github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/arn @@ -309,7 +309,7 @@ github.com/qiniu/go-sdk/v7/conf github.com/qiniu/go-sdk/v7/internal/log github.com/qiniu/go-sdk/v7/reqid github.com/qiniu/go-sdk/v7/storage -# github.com/qiniu/qmgo v1.1.0 +# github.com/qiniu/qmgo v1.1.1 ## explicit; go 1.16 github.com/qiniu/qmgo github.com/qiniu/qmgo/field @@ -465,7 +465,7 @@ golang.org/x/crypto/scrypt golang.org/x/crypto/sha3 golang.org/x/crypto/ssh golang.org/x/crypto/ssh/internal/bcrypt_pbkdf -# golang.org/x/net v0.0.0-20220630215102-69896b714898 +# golang.org/x/net v0.0.0-20220706163947-c90051bbdb60 ## explicit; go 1.17 golang.org/x/net/html golang.org/x/net/html/atom @@ -516,7 +516,7 @@ golang.org/x/text/width # golang.org/x/time v0.0.0-20220609170525-579cf78fd858 ## explicit golang.org/x/time/rate -# google.golang.org/genproto v0.0.0-20220630174209-ad1d48641aa7 +# google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 ## explicit; go 1.15 google.golang.org/genproto/googleapis/api/annotations google.golang.org/genproto/googleapis/rpc/status