From 3bb6b9fa37d45fc0fec1a64cecf21ba2eb04b326 Mon Sep 17 00:00:00 2001 From: yinheli Date: Sat, 29 Jan 2022 16:02:03 +0800 Subject: [PATCH 1/3] chore: update gitignore file --- tools/xservice/gogen/assets/project/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/xservice/gogen/assets/project/.gitignore b/tools/xservice/gogen/assets/project/.gitignore index 323e8a8..c0d8b30 100644 --- a/tools/xservice/gogen/assets/project/.gitignore +++ b/tools/xservice/gogen/assets/project/.gitignore @@ -34,3 +34,5 @@ __debug_bin go.sum !.gitkeep +!.clang-format +!.golangci.yml From 4a978d5711a98e58ab5dc1bcf3e800b003b30d6f Mon Sep 17 00:00:00 2001 From: yinheli Date: Mon, 14 Feb 2022 17:49:10 +0800 Subject: [PATCH 2/3] chore: update dependencies --- go.mod | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 337128a..367b6c2 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/xinpianchang/xservice go 1.16 require ( - github.com/Shopify/sarama v1.31.0 + github.com/Shopify/sarama v1.31.1 github.com/bsm/redislock v0.7.2 github.com/cloudflare/tableflip v1.2.2 github.com/dave/jennifer v1.5.0 @@ -23,26 +23,27 @@ require ( github.com/labstack/gommon v0.3.1 github.com/opentracing/opentracing-go v1.2.0 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.12.0 + github.com/prometheus/client_golang v1.12.1 github.com/robfig/cron/v3 v3.0.1 github.com/soheilhy/cmux v0.1.5 github.com/speps/go-hashids/v2 v2.0.1 - github.com/spf13/afero v1.8.0 // indirect + github.com/spf13/afero v1.8.1 // indirect github.com/spf13/cobra v1.3.0 github.com/spf13/viper v1.10.1 github.com/stretchr/testify v1.7.0 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible - go.etcd.io/etcd/api/v3 v3.5.1 - go.etcd.io/etcd/client/v3 v3.5.1 + go.etcd.io/etcd/api/v3 v3.5.2 + go.etcd.io/etcd/client/v3 v3.5.2 go.uber.org/multierr v1.7.0 // indirect - go.uber.org/zap v1.20.0 - golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8 // indirect - golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect - golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect - google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 // indirect + go.uber.org/zap v1.21.0 + golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 // indirect + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect + golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + google.golang.org/genproto v0.0.0-20220211171837-173942840c17 // indirect google.golang.org/grpc v1.44.0 - gopkg.in/ini.v1 v1.66.3 // indirect + gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v2 v2.4.0 gorm.io/datatypes v1.0.5 From dea02b7e58a9337c43213c05919384fdac5cfcd4 Mon Sep 17 00:00:00 2001 From: yinheli Date: Thu, 10 Mar 2022 11:40:31 +0800 Subject: [PATCH 3/3] chore: update dependencies - sarama: fix deadlock - echo v4: fix real ip issue more info: - https://github.com/Shopify/sarama/releases/tag/v1.32.0 - https://github.com/labstack/echo/releases/tag/v4.7.0 --- go.mod | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 367b6c2..471ff1d 100644 --- a/go.mod +++ b/go.mod @@ -3,24 +3,25 @@ module github.com/xinpianchang/xservice go 1.16 require ( - github.com/Shopify/sarama v1.31.1 + github.com/Shopify/sarama v1.32.0 github.com/bsm/redislock v0.7.2 github.com/cloudflare/tableflip v1.2.2 github.com/dave/jennifer v1.5.0 github.com/getsentry/sentry-go v0.12.0 - github.com/go-playground/validator/v10 v10.10.0 + github.com/go-playground/validator/v10 v10.10.1 github.com/go-redis/redis/v8 v8.11.4 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/google/gops v0.3.22 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.3 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.8.0 github.com/jarcoal/httpmock v1.1.0 github.com/jinzhu/copier v0.3.5 - github.com/klauspost/compress v1.14.2 // indirect + github.com/klauspost/compress v1.15.0 // indirect github.com/labstack/echo-contrib v0.12.0 - github.com/labstack/echo/v4 v4.6.3 + github.com/labstack/echo/v4 v4.7.0 github.com/labstack/gommon v0.3.1 + github.com/magiconair/properties v1.8.6 // indirect github.com/opentracing/opentracing-go v1.2.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.1 @@ -35,22 +36,22 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible go.etcd.io/etcd/api/v3 v3.5.2 go.etcd.io/etcd/client/v3 v3.5.2 - go.uber.org/multierr v1.7.0 // indirect + go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 - golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 // indirect - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect - golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - google.golang.org/genproto v0.0.0-20220211171837-173942840c17 // indirect - google.golang.org/grpc v1.44.0 + golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 // indirect + golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect + golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect + golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect + google.golang.org/genproto v0.0.0-20220308174144-ae0e22291548 // indirect + google.golang.org/grpc v1.45.0 gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v2 v2.4.0 - gorm.io/datatypes v1.0.5 - gorm.io/driver/mysql v1.2.3 - gorm.io/driver/postgres v1.2.3 // indirect - gorm.io/driver/sqlite v1.2.6 // indirect - gorm.io/driver/sqlserver v1.2.1 // indirect - gorm.io/gorm v1.22.5 + gorm.io/datatypes v1.0.6 + gorm.io/driver/mysql v1.3.2 + gorm.io/driver/postgres v1.3.1 // indirect + gorm.io/driver/sqlite v1.3.1 // indirect + gorm.io/driver/sqlserver v1.3.1 // indirect + gorm.io/gorm v1.23.2 gorm.io/plugin/opentracing v0.0.0-20211220013347-7d2b2af23560 )