diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index d46b6d1f..00000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -repo_token: lEBySAc6lF1zyKSbigsD7Ov8gXnTmHV7G \ No newline at end of file diff --git a/go.mod b/go.mod index c4acb1cc..cb9f482f 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,106 @@ module github.com/dtapps/go-library go 1.18 + +require ( + github.com/dtapps/go-library/service v0.0.0-20220320092139-34887507f205 + github.com/dtapps/go-library/utils v0.0.0-20220320092139-34887507f205 +) + +require ( + github.com/dtapps/go-library/service/dingdanxia v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/dingtalk v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/eastiot v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/ejiaofei v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/ip v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/jd v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/kashangwl v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/meituan v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/pinduoduo v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/pintoto v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/taobao v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/tianyancha v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/wechatminiprogram v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/wechatoffice v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/wechatpayapiv3 v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/wechatqy v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/wechatunion v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/service/wikeyun v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goaes v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goarray v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gobase64 v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/godecimal v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/godmail v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goenv v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gofiles v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gofloat v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goget v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goheader v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goint v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goint64 v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goip v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gojson v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goless v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/golock v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/golog v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gomac v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gomd5 v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gomongo v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gomysql v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goparams v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gophp v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gopostgresql v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gopreg v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gorandom v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/goredis v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gorequest v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gorsa v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gosort v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gossh v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gossl v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gostring v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gotime v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gourl v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/gouuid v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/phpjson v0.0.0-20220320092139-34887507f205 // indirect + github.com/dtapps/go-library/utils/rmb v0.0.0-20220320092139-34887507f205 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-redis/redis/v8 v8.11.5 // indirect + github.com/go-sql-driver/mysql v1.6.0 // indirect + github.com/go-stack/stack v1.8.1 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.11.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.2.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.10.0 // indirect + github.com/jackc/pgx/v4 v4.15.0 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect + github.com/klauspost/compress v1.15.1 // indirect + github.com/natefinch/lumberjack v2.0.0+incompatible // indirect + github.com/nilorg/sdk v0.0.0-20210429091026-95b6cdc95c84 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/shopspring/decimal v1.3.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.1.1 // indirect + github.com/xdg-go/stringprep v1.0.3 // indirect + github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect + go.mongodb.org/mongo-driver v1.8.4 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.8.0 // indirect + go.uber.org/zap v1.21.0 // indirect + golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect + golang.org/x/text v0.3.7 // indirect + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect + gorm.io/driver/mysql v1.3.2 // indirect + gorm.io/driver/postgres v1.3.1 // indirect + gorm.io/gorm v1.23.3 // indirect +) diff --git a/library.go b/library.go index 43d0286b..61f55876 100644 --- a/library.go +++ b/library.go @@ -4,3 +4,7 @@ import ( _ "github.com/dtapps/go-library/service" _ "github.com/dtapps/go-library/utils" ) + +func Version() string { + return "v1.0.41" +} diff --git a/service/dingdanxia/go.mod b/service/dingdanxia/go.mod index 0d866a30..09b79fb1 100644 --- a/service/dingdanxia/go.mod +++ b/service/dingdanxia/go.mod @@ -1,3 +1,31 @@ module github.com/dtapps/go-library/service/dingdanxia go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320035257-384fd01c7e13 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/dingtalk/go.mod b/service/dingtalk/go.mod index 7f3479f8..49f9dc74 100644 --- a/service/dingtalk/go.mod +++ b/service/dingtalk/go.mod @@ -1,3 +1,31 @@ module github.com/dtapps/go-library/service/dingtalk go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320035257-384fd01c7e13 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/eastiot/go.mod b/service/eastiot/go.mod index 8f1a96f2..e83ee841 100644 --- a/service/eastiot/go.mod +++ b/service/eastiot/go.mod @@ -1,3 +1,32 @@ module github.com/dtapps/go-library/service/eastiot go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320035257-384fd01c7e13 + github.com/dtapps/go-library/utils/gomd5 v0.0.0-20220320035257-384fd01c7e13 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/ejiaofei/go.mod b/service/ejiaofei/go.mod index 7d67f77b..3f730526 100644 --- a/service/ejiaofei/go.mod +++ b/service/ejiaofei/go.mod @@ -1,3 +1,32 @@ module github.com/dtapps/go-library/service/ejiaofei go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gomd5 v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/ip/go.mod b/service/ip/go.mod index 263d392f..3519d860 100644 --- a/service/ip/go.mod +++ b/service/ip/go.mod @@ -1,3 +1,8 @@ module github.com/dtapps/go-library/service/ip go 1.18 + +require ( + github.com/dtapps/go-library/utils/gostring v0.0.0-20220320035257-384fd01c7e13 + golang.org/x/text v0.3.7 +) diff --git a/service/jd/go.mod b/service/jd/go.mod index bf1e03e1..58a35af9 100644 --- a/service/jd/go.mod +++ b/service/jd/go.mod @@ -1,3 +1,31 @@ module github.com/dtapps/go-library/service/jd go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/kashangwl/go.mod b/service/kashangwl/go.mod index a8452677..c24eac85 100644 --- a/service/kashangwl/go.mod +++ b/service/kashangwl/go.mod @@ -1,3 +1,33 @@ module github.com/dtapps/go-library/service/kashangwl go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/goparams v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/nilorg/sdk v0.0.0-20210429091026-95b6cdc95c84 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/meituan/go.mod b/service/meituan/go.mod index 8ce4dd38..ab0056b8 100644 --- a/service/meituan/go.mod +++ b/service/meituan/go.mod @@ -1,3 +1,32 @@ module github.com/dtapps/go-library/service/meituan go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gotime v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/pinduoduo/go.mod b/service/pinduoduo/go.mod index 02ecf651..d90485a8 100644 --- a/service/pinduoduo/go.mod +++ b/service/pinduoduo/go.mod @@ -1,3 +1,32 @@ module github.com/dtapps/go-library/service/pinduoduo go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gostring v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/pintoto/go.mod b/service/pintoto/go.mod index 14ad8264..072a8434 100644 --- a/service/pintoto/go.mod +++ b/service/pintoto/go.mod @@ -1,3 +1,30 @@ module github.com/dtapps/go-library/service/pintoto go 1.18 + +require ( + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/taobao/go.mod b/service/taobao/go.mod index 4e439f01..20c3aca6 100644 --- a/service/taobao/go.mod +++ b/service/taobao/go.mod @@ -1,3 +1,32 @@ module github.com/dtapps/go-library/service/taobao go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gostring v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/tianyancha/go.mod b/service/tianyancha/go.mod index d795e3b5..d9a23d84 100644 --- a/service/tianyancha/go.mod +++ b/service/tianyancha/go.mod @@ -1,3 +1,10 @@ module github.com/dtapps/go-library/service/tianyancha go 1.18 + +require github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320064127-7d7f1f882cd8 + +require ( + github.com/dtapps/go-library/utils/goheader v0.0.0-20220320040709-ad8a5f0e9e40 // indirect + github.com/dtapps/go-library/utils/gorequest v0.0.0-20220320040709-ad8a5f0e9e40 // indirect +) diff --git a/service/wechatminiprogram/go.mod b/service/wechatminiprogram/go.mod index 9e2b4fe1..8ed13c7a 100644 --- a/service/wechatminiprogram/go.mod +++ b/service/wechatminiprogram/go.mod @@ -1,3 +1,35 @@ module github.com/dtapps/go-library/service/wechatminiprogram go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320064127-7d7f1f882cd8 + github.com/dtapps/go-library/utils/goredis v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gotime v0.0.0-20220320040709-ad8a5f0e9e40 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/dtapps/go-library/utils/goheader v0.0.0-20220320040709-ad8a5f0e9e40 // indirect + github.com/dtapps/go-library/utils/gorequest v0.0.0-20220320040709-ad8a5f0e9e40 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-redis/redis/v8 v8.11.5 // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/wechatoffice/go.mod b/service/wechatoffice/go.mod index cd5e1aa6..7eb1db8e 100644 --- a/service/wechatoffice/go.mod +++ b/service/wechatoffice/go.mod @@ -1,3 +1,33 @@ module github.com/dtapps/go-library/service/wechatoffice go 1.18 + +require ( + github.com/dtapps/go-library/utils/gorandom v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/goredis v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gotime v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/wechatpayapiv3/go.mod b/service/wechatpayapiv3/go.mod index 074dc37d..7d01a98d 100644 --- a/service/wechatpayapiv3/go.mod +++ b/service/wechatpayapiv3/go.mod @@ -1,3 +1,32 @@ module github.com/dtapps/go-library/service/wechatpayapiv3 go 1.18 + +require ( + github.com/dtapps/go-library/utils/gorandom v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gorequest v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/wechatqy/go.mod b/service/wechatqy/go.mod index 2b755555..c380105a 100644 --- a/service/wechatqy/go.mod +++ b/service/wechatqy/go.mod @@ -1,3 +1,31 @@ module github.com/dtapps/go-library/service/wechatqy go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/wechatunion/go.mod b/service/wechatunion/go.mod index 942bfea1..07de7cef 100644 --- a/service/wechatunion/go.mod +++ b/service/wechatunion/go.mod @@ -1,3 +1,33 @@ module github.com/dtapps/go-library/service/wechatunion go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/goredis v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gotime v0.0.0-20220320040709-ad8a5f0e9e40 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-redis/redis/v8 v8.11.5 // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/service/wikeyun/go.mod b/service/wikeyun/go.mod index 9d525536..5a33f4cd 100644 --- a/service/wikeyun/go.mod +++ b/service/wikeyun/go.mod @@ -1,3 +1,33 @@ module github.com/dtapps/go-library/service/wikeyun go 1.18 + +require ( + github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320064127-7d7f1f882cd8 + github.com/go-redis/redis/v8 v8.11.5 + go.mongodb.org/mongo-driver v1.8.4 + go.uber.org/zap v1.21.0 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/dtapps/go-library/utils/goheader v0.0.0-20220320040709-ad8a5f0e9e40 // indirect + github.com/dtapps/go-library/utils/gorequest v0.0.0-20220320040709-ad8a5f0e9e40 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/utils/godecimal/go.mod b/utils/godecimal/go.mod new file mode 100644 index 00000000..fdc6c7f5 --- /dev/null +++ b/utils/godecimal/go.mod @@ -0,0 +1,3 @@ +module github.com/dtapps/go-library/utils/godecimal + +go 1.18 diff --git a/utils/godecimal/godecimal.go b/utils/godecimal/godecimal.go index 63451eea..331a5bb2 100644 --- a/utils/godecimal/godecimal.go +++ b/utils/godecimal/godecimal.go @@ -2,6 +2,7 @@ package godecimal import ( "fmt" + "math" "strconv" ) @@ -10,3 +11,9 @@ func Decimal(value float64) float64 { value, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", value), 64) return value } + +// Round 四舍五入 +func Round(f float64, n int) float64 { + n10 := math.Pow10(n) + return math.Trunc((f+0.5/n10)*n10) / n10 +} diff --git a/utils/godmail/go.sum b/utils/godmail/go.sum deleted file mode 100644 index b530e335..00000000 --- a/utils/godmail/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= -gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= -gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= -gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= diff --git a/utils/goenv/go.mod b/utils/goenv/go.mod index f7e626bd..7b9b9b6f 100644 --- a/utils/goenv/go.mod +++ b/utils/goenv/go.mod @@ -2,4 +2,4 @@ module github.com/dtapps/go-library/utils/goenv go 1.18 -require github.com/dtapps/go-library/utils/gostring v0.0.0-20220320030939-97dd0d930b08 +require github.com/dtapps/go-library/utils/gostring v0.0.0-20220320040709-ad8a5f0e9e40 diff --git a/utils/goenv/go.sum b/utils/goenv/go.sum deleted file mode 100644 index fc6ad3cc..00000000 --- a/utils/goenv/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/dtapps/go-library/utils/gostring v0.0.0-20220320030939-97dd0d930b08 h1:4OoRMcKUDxuiM/FO2TtrW+kgYpiUNWZdBqFnRXiPEiE= -github.com/dtapps/go-library/utils/gostring v0.0.0-20220320030939-97dd0d930b08/go.mod h1:/I01jp7NkiWZaPvtPifORyhWx3s5WgFwdXVg5tiJVGU= diff --git a/utils/gohttp/go.mod b/utils/gohttp/go.mod index 4aed1206..ca6c9107 100644 --- a/utils/gohttp/go.mod +++ b/utils/gohttp/go.mod @@ -1,3 +1,8 @@ module github.com/dtapps/go-library/utils/gohttp go 1.18 + +require ( + github.com/dtapps/go-library/utils/goheader v0.0.0-20220320040709-ad8a5f0e9e40 + github.com/dtapps/go-library/utils/gorequest v0.0.0-20220320040709-ad8a5f0e9e40 +) diff --git a/utils/gohttp/gohttp.go b/utils/gohttp/gohttp.go index ec91dd95..f72f6532 100644 --- a/utils/gohttp/gohttp.go +++ b/utils/gohttp/gohttp.go @@ -2,11 +2,11 @@ package gohttp import ( "bytes" - "dtapps/dta/library/utils/goheader" - "dtapps/dta/library/utils/gorequest" "encoding/json" "errors" "fmt" + "github.com/dtapps/go-library/utils/goheader" + "github.com/dtapps/go-library/utils/gorequest" "io/ioutil" "net/http" "net/url" diff --git a/utils/goip/go.mod b/utils/goip/go.mod index d9133ed5..7b3e9ff7 100644 --- a/utils/goip/go.mod +++ b/utils/goip/go.mod @@ -1,3 +1,5 @@ module github.com/dtapps/go-library/utils/goip go 1.18 + +require github.com/dtapps/go-library/utils/gohttp v0.0.0-20220320040709-ad8a5f0e9e40 diff --git a/utils/goip/goip.go b/utils/goip/goip.go index 2019a7b9..61ed801f 100644 --- a/utils/goip/goip.go +++ b/utils/goip/goip.go @@ -1,8 +1,8 @@ package goip import ( - "dtapps/dta/library/utils/gohttp" "encoding/json" + "github.com/dtapps/go-library/utils/gohttp" "log" "net" ) diff --git a/utils/gojson/gojson.go b/utils/gojson/gojson.go index c49ffefe..a1e046bd 100644 --- a/utils/gojson/gojson.go +++ b/utils/gojson/gojson.go @@ -39,3 +39,9 @@ func JsonEncodeNoError(data interface{}) string { jsons, _ := json.Marshal(data) return string(jsons) } + +func JsonDecodesNoError(data string) []string { + var dat []string + _ = json.Unmarshal([]byte(data), &dat) + return dat +} diff --git a/utils/golock/go.mod b/utils/golock/go.mod index ca80ce2f..965e634b 100644 --- a/utils/golock/go.mod +++ b/utils/golock/go.mod @@ -2,7 +2,9 @@ module github.com/dtapps/go-library/utils/golock go 1.18 -require github.com/go-redis/redis/v8 v8.11.5 +require ( + github.com/go-redis/redis/v8 v8.11.5 +) require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect diff --git a/utils/golock/go.sum b/utils/golock/go.sum deleted file mode 100644 index 7342ff81..00000000 --- a/utils/golock/go.sum +++ /dev/null @@ -1,15 +0,0 @@ -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/utils/golock/lock.go b/utils/golock/lock.go index 8432710e..24cc3835 100644 --- a/utils/golock/lock.go +++ b/utils/golock/lock.go @@ -2,8 +2,8 @@ package golock import ( "context" - "dtapps/dta/global" - "dtapps/dta/library/utils/gouuid" + "github.com/dtapps/go-library/utils/goredis" + "github.com/dtapps/go-library/utils/gouuid" "github.com/go-redis/redis/v8" "time" ) @@ -12,6 +12,7 @@ type lock struct { key string expiration time.Duration requestId string + Db goredis.App } func NewLock(key string, expiration time.Duration) *lock { @@ -26,7 +27,7 @@ func (lk *lock) Get() bool { defer cancel() - ok, err := global.GvaRedis.Db.SetNX(cxt, lk.key, lk.requestId, lk.expiration).Result() + ok, err := lk.Db.Db.SetNX(cxt, lk.key, lk.requestId, lk.expiration).Result() if err != nil { @@ -53,6 +54,6 @@ func (lk *lock) Release() error { script := redis.NewScript(luaScript) - _, err := script.Run(cxt, global.GvaRedis.Db, []string{lk.key}, lk.requestId).Result() + _, err := script.Run(cxt, lk.Db.Db, []string{lk.key}, lk.requestId).Result() return err } diff --git a/utils/golog/go.mod b/utils/golog/go.mod index eaf30df0..7fd57c33 100644 --- a/utils/golog/go.mod +++ b/utils/golog/go.mod @@ -1,3 +1,15 @@ module github.com/dtapps/go-library/utils/golog go 1.18 + +require ( + github.com/natefinch/lumberjack v2.0.0+incompatible + go.uber.org/zap v1.21.0 +) + +require ( + github.com/BurntSushi/toml v1.0.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect +) diff --git a/utils/gomongo/go.mod b/utils/gomongo/go.mod index 7aa952cd..3e9aaa43 100644 --- a/utils/gomongo/go.mod +++ b/utils/gomongo/go.mod @@ -1,3 +1,19 @@ module github.com/dtapps/go-library/utils/gomongo go 1.18 + +require go.mongodb.org/mongo-driver v1.8.4 + +require ( + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect + golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect + golang.org/x/text v0.3.5 // indirect +) diff --git a/utils/gomysql/go.mod b/utils/gomysql/go.mod index 723a545d..d183d943 100644 --- a/utils/gomysql/go.mod +++ b/utils/gomysql/go.mod @@ -1,3 +1,14 @@ module github.com/dtapps/go-library/utils/gomysql go 1.18 + +require ( + gorm.io/driver/mysql v1.3.2 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/go-sql-driver/mysql v1.6.0 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect +) diff --git a/utils/goparams/go.mod b/utils/goparams/go.mod index a1560e07..7c5e2e1e 100644 --- a/utils/goparams/go.mod +++ b/utils/goparams/go.mod @@ -1,3 +1,5 @@ module github.com/dtapps/go-library/utils/goparams go 1.18 + +require github.com/nilorg/sdk v0.0.0-20210429091026-95b6cdc95c84 diff --git a/utils/gophp/gophp.go b/utils/gophp/gophp.go index dc233d82..834ff7be 100644 --- a/utils/gophp/gophp.go +++ b/utils/gophp/gophp.go @@ -1,6 +1,6 @@ package gophp -import "dtapps/dta/library/utils/gophp/serialize" +import "github.com/dtapps/go-library/utils/gophp/serialize" // Serialize 序列 func Serialize(value interface{}) ([]byte, error) { diff --git a/utils/gophp/serialize/serialize.go b/utils/gophp/serialize/serialize.go index 6fcd10c6..5015c1f8 100644 --- a/utils/gophp/serialize/serialize.go +++ b/utils/gophp/serialize/serialize.go @@ -2,9 +2,9 @@ package serialize import ( "bytes" - "dtapps/dta/library/utils/goless" - "dtapps/dta/library/utils/gostring" "fmt" + "github.com/dtapps/go-library/utils/goless" + "github.com/dtapps/go-library/utils/gostring" "reflect" "sort" ) diff --git a/utils/gophp/serialize/unserialize.go b/utils/gophp/serialize/unserialize.go index de49fa2e..56894f81 100644 --- a/utils/gophp/serialize/unserialize.go +++ b/utils/gophp/serialize/unserialize.go @@ -2,8 +2,8 @@ package serialize import ( "bytes" - "dtapps/dta/library/utils/gostring" "fmt" + "github.com/dtapps/go-library/utils/gostring" "strconv" ) diff --git a/utils/gopostgresql/go.mod b/utils/gopostgresql/go.mod index 8cf577cd..8afc29ad 100644 --- a/utils/gopostgresql/go.mod +++ b/utils/gopostgresql/go.mod @@ -1,3 +1,23 @@ module github.com/dtapps/go-library/utils/gopostgresql go 1.18 + +require ( + gorm.io/driver/postgres v1.3.1 + gorm.io/gorm v1.23.3 +) + +require ( + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.10.1 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.2.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.9.1 // indirect + github.com/jackc/pgx/v4 v4.14.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/text v0.3.7 // indirect +) diff --git a/utils/goredis/go.mod b/utils/goredis/go.mod index eff56d3d..7968590d 100644 --- a/utils/goredis/go.mod +++ b/utils/goredis/go.mod @@ -1,3 +1,10 @@ module github.com/dtapps/go-library/utils/goredis go 1.18 + +require github.com/go-redis/redis/v8 v8.11.5 + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect +) diff --git a/utils/goround/go.mod b/utils/goround/go.mod deleted file mode 100644 index 01e0c543..00000000 --- a/utils/goround/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/dtapps/go-library/utils/goround - -go 1.18 diff --git a/utils/goround/goround.go b/utils/goround/goround.go deleted file mode 100644 index 897d2bca..00000000 --- a/utils/goround/goround.go +++ /dev/null @@ -1,13 +0,0 @@ -package goround - -import ( - "fmt" - "strconv" -) - -// FloatRound 截取小数位数 -func FloatRound(f float64, n int) float64 { - format := "%." + strconv.Itoa(n) + "f" - res, _ := strconv.ParseFloat(fmt.Sprintf(format, f), 64) - return res -} diff --git a/utils/gosort/gpsort.go b/utils/gosort/gosort.go similarity index 100% rename from utils/gosort/gpsort.go rename to utils/gosort/gosort.go diff --git a/utils/gossh/go.mod b/utils/gossh/go.mod index fa7341a5..adb37f23 100644 --- a/utils/gossh/go.mod +++ b/utils/gossh/go.mod @@ -1,3 +1,7 @@ module github.com/dtapps/go-library/utils/gossh go 1.18 + +require golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd + +require golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect diff --git a/utils/rmb/go.mod b/utils/rmb/go.mod index 81ec4c34..cf812765 100644 --- a/utils/rmb/go.mod +++ b/utils/rmb/go.mod @@ -1,3 +1,5 @@ module github.com/dtapps/go-library/utils/rmb go 1.18 + +require github.com/shopspring/decimal v1.3.1 diff --git a/utils/utils.go b/utils/utils.go index 67ddcafc..b791d103 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -30,7 +30,6 @@ import ( _ "github.com/dtapps/go-library/utils/gorandom" _ "github.com/dtapps/go-library/utils/goredis" _ "github.com/dtapps/go-library/utils/gorequest" - //_ "github.com/dtapps/go-library/utils/goround _ "github.com/dtapps/go-library/utils/gorsa" _ "github.com/dtapps/go-library/utils/gosort" _ "github.com/dtapps/go-library/utils/gossh"