diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 7adadde4..9f4e74b8 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,9 +1,9 @@ name: Go Test on: push: - branches: [ 1.x, 2.x, feature/* ] + branches: [ 1.x, feature/* ] pull_request: - branches: [ 1.x, 2.x ] + branches: [ 1.x ] env: GOPROXY: "https://proxy.golang.org" diff --git a/.gitignore b/.gitignore index 62303778..89646676 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,4 @@ vendor/ .idea _backup -example -.todo \ No newline at end of file +example \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..89da4745 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,14 @@ +# CHANGELOG + +## `TODO` + +- [ ] 功能:引入事件驱动 +- [ ] 功能:完善缓存库 + +## v1.1.0 - 2023-11-14 + +- refactor(hashing): Change the file path for `Hasher` by @flc1125 #30 +- build(deps): bump github.com/redis/go-redis/v9 from 9.2.1 to 9.3.0 by @dependabot #27 +- feat(gorm): Added `LoggerAdapter` by @flc1125 in #28 +- build(deps): bump google.golang.org/grpc from 1.58.0 to 1.58.3 by @dependabot #29 + diff --git a/README.md b/README.md index cd947237..7ab79bd0 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ## Installation ```bash -go get github.com/go-kratos-ecosystem/components/v2 +go get github.com/go-packagist/go-kratos-components ``` ## Components diff --git a/contract/generator/generator.go b/contract/generator/generator.go new file mode 100644 index 00000000..4477242c --- /dev/null +++ b/contract/generator/generator.go @@ -0,0 +1,5 @@ +package generator + +type StringGenerator interface { + Generate() string +} diff --git a/crontab/README.md b/crontab/README.md index 29c12cd1..e331aa0b 100644 --- a/crontab/README.md +++ b/crontab/README.md @@ -12,8 +12,8 @@ import ( "github.com/redis/go-redis/v9" "github.com/robfig/cron/v3" - "github.com/go-kratos-ecosystem/components/v2/crontab" - redisMutex "github.com/go-kratos-ecosystem/components/v2/crontab/mutex/redis" + "github.com/go-packagist/go-kratos-components/crontab" + redisMutex "github.com/go-packagist/go-kratos-components/crontab/mutex/redis" ) func main() { diff --git a/crontab/mutex/redis/mutex.go b/crontab/mutex/redis/mutex.go index 8332a715..484192cd 100644 --- a/crontab/mutex/redis/mutex.go +++ b/crontab/mutex/redis/mutex.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "github.com/redis/go-redis/v9" - "github.com/go-kratos-ecosystem/components/v2/crontab" + "github.com/go-packagist/go-kratos-components/crontab" ) type Mutex struct { diff --git a/crontab/mutex/redis/mutex_test.go b/crontab/mutex/redis/mutex_test.go index 6723ba72..5265e770 100644 --- a/crontab/mutex/redis/mutex_test.go +++ b/crontab/mutex/redis/mutex_test.go @@ -8,7 +8,7 @@ import ( "github.com/redis/go-redis/v9" "github.com/stretchr/testify/assert" - "github.com/go-kratos-ecosystem/components/v2/crontab" + "github.com/go-packagist/go-kratos-components/crontab" ) var ( diff --git a/crontab/server.go b/crontab/server.go index 50846cf9..0ea2a59c 100644 --- a/crontab/server.go +++ b/crontab/server.go @@ -6,9 +6,12 @@ import ( "sync" "time" + "github.com/go-kratos/kratos/v2/transport" "github.com/robfig/cron/v3" ) +var _ transport.Server = (*Server)(nil) + type Server struct { cron *cron.Cron diff --git a/generator/uuid/uuid_test.go b/generator/uuid/uuid_test.go index e1b4d870..25f2c6e7 100644 --- a/generator/uuid/uuid_test.go +++ b/generator/uuid/uuid_test.go @@ -3,9 +3,8 @@ package uuid import ( "testing" + "github.com/go-packagist/go-kratos-components/strable" "github.com/stretchr/testify/assert" - - "github.com/go-kratos-ecosystem/components/v2/strable" ) func TestGenerate(t *testing.T) { diff --git a/go.mod b/go.mod index f20a5005..ab4ec711 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/go-kratos-ecosystem/components/v2 +module github.com/go-packagist/go-kratos-components go 1.20 @@ -18,13 +18,12 @@ require ( github.com/go-kratos/aegis v0.2.0 // indirect github.com/go-playground/form/v4 v4.2.1 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/gorilla/mux v1.8.1 // indirect + github.com/gorilla/mux v1.8.0 // indirect github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.15.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect - google.golang.org/grpc v1.60.1 // indirect - google.golang.org/protobuf v1.32.0 // indirect + golang.org/x/sync v0.3.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/grpc v1.58.3 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 84be9c01..b693246c 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= -github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -38,22 +38,21 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 h1:YJ5pD9rF8o9Qtta0Cmy9rdBwkSjrTCT6XTiUQVOtIos= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= -google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= +google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= +google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/hashing/hashing_test.go b/hashing/hashing_test.go index ecbcf682..807a4179 100644 --- a/hashing/hashing_test.go +++ b/hashing/hashing_test.go @@ -3,10 +3,9 @@ package hashing_test import ( "testing" + "github.com/go-packagist/go-kratos-components/hashing" + _ "github.com/go-packagist/go-kratos-components/hashing/md5" "github.com/stretchr/testify/assert" - - "github.com/go-kratos-ecosystem/components/v2/hashing" - _ "github.com/go-kratos-ecosystem/components/v2/hashing/md5" ) func TestHasher_New(t *testing.T) { diff --git a/hashing/md5/hasher.go b/hashing/md5/hasher.go index b077dda2..68ce4cc0 100644 --- a/hashing/md5/hasher.go +++ b/hashing/md5/hasher.go @@ -4,7 +4,7 @@ import ( "crypto/md5" "fmt" - "github.com/go-kratos-ecosystem/components/v2/hashing" + "github.com/go-packagist/go-kratos-components/hashing" ) type hasher struct{} diff --git a/serializer/README.md b/serializer/README.md index ad7dc4da..9d25c225 100644 --- a/serializer/README.md +++ b/serializer/README.md @@ -8,7 +8,7 @@ package serializer_test import ( "log" - "github.com/go-kratos-ecosystem/components/v2/serializer/json" + "github.com/go-packagist/go-kratos-components/serializer/json" ) var j = json.Serializer diff --git a/serializer/example_test.go b/serializer/example_test.go index 93b5931d..0148a622 100644 --- a/serializer/example_test.go +++ b/serializer/example_test.go @@ -3,7 +3,7 @@ package serializer_test import ( "log" - "github.com/go-kratos-ecosystem/components/v2/serializer/json" + "github.com/go-packagist/go-kratos-components/serializer/json" ) var j = json.Serializer diff --git a/serializer/json/json.go b/serializer/json/json.go index 4f42d375..a182305e 100644 --- a/serializer/json/json.go +++ b/serializer/json/json.go @@ -3,7 +3,7 @@ package json import ( "encoding/json" - "github.com/go-kratos-ecosystem/components/v2/serializer" + "github.com/go-packagist/go-kratos-components/serializer" ) var Serializer serializer.Serializable = &jsonSerializer{} diff --git a/udp/README.md b/udp/README.md index 6d8c2479..86959cb5 100644 --- a/udp/README.md +++ b/udp/README.md @@ -10,7 +10,7 @@ import ( "github.com/go-kratos/kratos/v2" - "github.com/go-kratos-ecosystem/components/v2/udp" + "github.com/go-packagist/go-kratos-components/udp" ) func main() { diff --git a/x/cache/redis/store.go b/x/cache/redis/store.go index c460014e..2fa4e7d9 100644 --- a/x/cache/redis/store.go +++ b/x/cache/redis/store.go @@ -6,9 +6,9 @@ import ( "github.com/redis/go-redis/v9" - "github.com/go-kratos-ecosystem/components/v2/serializer" - "github.com/go-kratos-ecosystem/components/v2/serializer/json" - "github.com/go-kratos-ecosystem/components/v2/x/cache" + "github.com/go-packagist/go-kratos-components/serializer" + "github.com/go-packagist/go-kratos-components/serializer/json" + "github.com/go-packagist/go-kratos-components/x/cache" ) type Store struct { diff --git a/x/cache/repository.go b/x/cache/repository.go index 98be7efe..f409e8c1 100644 --- a/x/cache/repository.go +++ b/x/cache/repository.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/go-kratos-ecosystem/components/v2/helper" + "github.com/go-packagist/go-kratos-components/helper" ) type Repository interface {