From 43da1db4832f5637789f475a40ca3bf57a20ec41 Mon Sep 17 00:00:00 2001 From: tx7do Date: Wed, 13 Nov 2024 13:00:36 +0800 Subject: [PATCH] feat: upgrade go.mod. --- cache/redis/go.mod | 4 +++- cache/redis/go.sum | 2 -- config/apollo/go.mod | 2 +- config/consul/go.mod | 2 +- config/etcd/go.mod | 2 +- config/kubernetes/go.mod | 2 +- config/nacos/go.mod | 2 +- config/polaris/go.mod | 2 +- go.mod | 2 +- logger/aliyun/go.mod | 2 +- logger/fluent/go.mod | 2 +- logger/logrus/go.mod | 2 +- logger/tencent/go.mod | 2 +- logger/zap/go.mod | 2 +- oss/minio/go.mod | 4 +++- oss/minio/go.sum | 2 -- registry/consul/go.mod | 2 +- registry/etcd/go.mod | 2 +- registry/eureka/go.mod | 2 +- registry/kubernetes/go.mod | 2 +- registry/nacos/go.mod | 2 +- registry/polaris/go.mod | 2 +- registry/servicecomb/go.mod | 2 +- registry/zookeeper/go.mod | 2 +- tag.bat | 4 ++-- upgrade.bat | 6 +++--- 26 files changed, 31 insertions(+), 31 deletions(-) diff --git a/cache/redis/go.mod b/cache/redis/go.mod index 96b1b42..170e695 100644 --- a/cache/redis/go.mod +++ b/cache/redis/go.mod @@ -4,11 +4,13 @@ go 1.22.0 toolchain go1.22.1 +replace github.com/tx7do/kratos-bootstrap/api => ../../api + require ( github.com/go-kratos/kratos/v2 v2.8.2 github.com/redis/go-redis/extra/redisotel/v9 v9.7.0 github.com/redis/go-redis/v9 v9.7.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/cache/redis/go.sum b/cache/redis/go.sum index 3239084..12e0634 100644 --- a/cache/redis/go.sum +++ b/cache/redis/go.sum @@ -27,8 +27,6 @@ github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tx7do/kratos-bootstrap/api v0.0.4 h1:X34nZ8c7oHDlfJRJfmyha6l6pkg8f71HM+4BOZlB7JE= -github.com/tx7do/kratos-bootstrap/api v0.0.4/go.mod h1:Ag3hjntWUFCJP9yQMSMqf5ezCS/pdKrLeYfrsmMkRjw= go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= diff --git a/config/apollo/go.mod b/config/apollo/go.mod index aa16986..f1539a3 100644 --- a/config/apollo/go.mod +++ b/config/apollo/go.mod @@ -9,7 +9,7 @@ replace github.com/tx7do/kratos-bootstrap/api => ../../api require ( github.com/go-kratos/kratos/contrib/config/apollo/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/config/consul/go.mod b/config/consul/go.mod index 900c759..f21e1aa 100644 --- a/config/consul/go.mod +++ b/config/consul/go.mod @@ -14,7 +14,7 @@ replace ( require ( github.com/go-kratos/kratos/v2 v2.8.2 github.com/hashicorp/consul/api v1.30.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/config/etcd/go.mod b/config/etcd/go.mod index 1ba8300..d78bb05 100644 --- a/config/etcd/go.mod +++ b/config/etcd/go.mod @@ -9,7 +9,7 @@ replace github.com/tx7do/kratos-bootstrap/api => ../../api require ( github.com/go-kratos/kratos/contrib/config/etcd/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 go.etcd.io/etcd/client/v3 v3.5.17 google.golang.org/grpc v1.68.0 ) diff --git a/config/kubernetes/go.mod b/config/kubernetes/go.mod index 50b7a8b..c06f539 100644 --- a/config/kubernetes/go.mod +++ b/config/kubernetes/go.mod @@ -14,7 +14,7 @@ replace ( require ( github.com/go-kratos/kratos/contrib/config/kubernetes/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 k8s.io/client-go v0.31.2 ) diff --git a/config/nacos/go.mod b/config/nacos/go.mod index 67dcc8c..2da7bb9 100644 --- a/config/nacos/go.mod +++ b/config/nacos/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-kratos/kratos/contrib/config/nacos/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 github.com/nacos-group/nacos-sdk-go v1.1.5 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/config/polaris/go.mod b/config/polaris/go.mod index a31632a..bcd4252 100644 --- a/config/polaris/go.mod +++ b/config/polaris/go.mod @@ -8,7 +8,7 @@ replace github.com/tx7do/kratos-bootstrap/api => ../../api require ( github.com/go-kratos/kratos/v2 v2.8.2 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/go.mod b/go.mod index ce6538d..64b90f5 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/gorilla/handlers v1.5.2 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.8.1 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 github.com/tx7do/kratos-bootstrap/config/apollo v0.0.4 github.com/tx7do/kratos-bootstrap/config/consul v0.0.4 github.com/tx7do/kratos-bootstrap/config/etcd v0.0.4 diff --git a/logger/aliyun/go.mod b/logger/aliyun/go.mod index f8171e3..23d77bb 100644 --- a/logger/aliyun/go.mod +++ b/logger/aliyun/go.mod @@ -9,7 +9,7 @@ replace github.com/tx7do/kratos-bootstrap/api => ../../api require ( github.com/go-kratos/kratos/contrib/log/aliyun/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/logger/fluent/go.mod b/logger/fluent/go.mod index 6bb222a..55a77b4 100644 --- a/logger/fluent/go.mod +++ b/logger/fluent/go.mod @@ -9,7 +9,7 @@ replace github.com/tx7do/kratos-bootstrap/api => ../../api require ( github.com/go-kratos/kratos/contrib/log/fluent/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/logger/logrus/go.mod b/logger/logrus/go.mod index 9206b3f..3899e4f 100644 --- a/logger/logrus/go.mod +++ b/logger/logrus/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-kratos/kratos/contrib/log/logrus/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 github.com/sirupsen/logrus v1.9.3 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/logger/tencent/go.mod b/logger/tencent/go.mod index 1e07d1e..e10818b 100644 --- a/logger/tencent/go.mod +++ b/logger/tencent/go.mod @@ -9,7 +9,7 @@ replace github.com/tx7do/kratos-bootstrap/api => ../../api require ( github.com/go-kratos/kratos/contrib/log/tencent/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/logger/zap/go.mod b/logger/zap/go.mod index e258661..2d500c4 100644 --- a/logger/zap/go.mod +++ b/logger/zap/go.mod @@ -9,7 +9,7 @@ replace github.com/tx7do/kratos-bootstrap/api => ../../api require ( github.com/go-kratos/kratos/contrib/log/zap/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 go.uber.org/zap v1.27.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) diff --git a/oss/minio/go.mod b/oss/minio/go.mod index 54936c6..158cb30 100644 --- a/oss/minio/go.mod +++ b/oss/minio/go.mod @@ -4,10 +4,12 @@ go 1.22.0 toolchain go1.22.1 +replace github.com/tx7do/kratos-bootstrap/api => ../../api + require ( github.com/go-kratos/kratos/v2 v2.8.2 github.com/minio/minio-go/v7 v7.0.80 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/oss/minio/go.sum b/oss/minio/go.sum index 7d07692..f3d0ce2 100644 --- a/oss/minio/go.sum +++ b/oss/minio/go.sum @@ -27,8 +27,6 @@ github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tx7do/kratos-bootstrap/api v0.0.4 h1:X34nZ8c7oHDlfJRJfmyha6l6pkg8f71HM+4BOZlB7JE= -github.com/tx7do/kratos-bootstrap/api v0.0.4/go.mod h1:Ag3hjntWUFCJP9yQMSMqf5ezCS/pdKrLeYfrsmMkRjw= golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= diff --git a/registry/consul/go.mod b/registry/consul/go.mod index 1c3ba9b..56f26ef 100644 --- a/registry/consul/go.mod +++ b/registry/consul/go.mod @@ -16,7 +16,7 @@ require ( github.com/go-kratos/kratos/v2 v2.8.2 github.com/hashicorp/consul/api v1.30.0 github.com/stretchr/testify v1.9.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/registry/etcd/go.mod b/registry/etcd/go.mod index b7e8609..b1f2dee 100644 --- a/registry/etcd/go.mod +++ b/registry/etcd/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 github.com/stretchr/testify v1.9.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 go.etcd.io/etcd/client/v3 v3.5.17 ) diff --git a/registry/eureka/go.mod b/registry/eureka/go.mod index e444403..f36314c 100644 --- a/registry/eureka/go.mod +++ b/registry/eureka/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-kratos/kratos/contrib/registry/eureka/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 github.com/stretchr/testify v1.9.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/registry/kubernetes/go.mod b/registry/kubernetes/go.mod index 4792176..33d7bb1 100644 --- a/registry/kubernetes/go.mod +++ b/registry/kubernetes/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-kratos/kratos/contrib/registry/kubernetes/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 github.com/stretchr/testify v1.9.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 k8s.io/client-go v0.31.2 ) diff --git a/registry/nacos/go.mod b/registry/nacos/go.mod index 454f157..a1e8b20 100644 --- a/registry/nacos/go.mod +++ b/registry/nacos/go.mod @@ -11,7 +11,7 @@ require ( github.com/go-kratos/kratos/v2 v2.8.2 github.com/nacos-group/nacos-sdk-go v1.1.5 github.com/stretchr/testify v1.9.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/registry/polaris/go.mod b/registry/polaris/go.mod index d76d8e5..500f1b8 100644 --- a/registry/polaris/go.mod +++ b/registry/polaris/go.mod @@ -11,7 +11,7 @@ require ( github.com/go-kratos/kratos/v2 v2.8.2 github.com/polarismesh/polaris-go v1.5.8 github.com/stretchr/testify v1.9.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/registry/servicecomb/go.mod b/registry/servicecomb/go.mod index 456c3dc..43f0345 100644 --- a/registry/servicecomb/go.mod +++ b/registry/servicecomb/go.mod @@ -11,7 +11,7 @@ require ( github.com/go-kratos/kratos/contrib/registry/servicecomb/v2 v2.0.0-20241105072421-f8b97f675b32 github.com/go-kratos/kratos/v2 v2.8.2 github.com/stretchr/testify v1.9.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/registry/zookeeper/go.mod b/registry/zookeeper/go.mod index 7379167..07ccddd 100644 --- a/registry/zookeeper/go.mod +++ b/registry/zookeeper/go.mod @@ -11,7 +11,7 @@ require ( github.com/go-kratos/kratos/v2 v2.8.2 github.com/go-zookeeper/zk v1.0.4 github.com/stretchr/testify v1.9.0 - github.com/tx7do/kratos-bootstrap/api v0.0.4 + github.com/tx7do/kratos-bootstrap/api v0.0.5 ) require ( diff --git a/tag.bat b/tag.bat index 793f3e0..68416bf 100644 --- a/tag.bat +++ b/tag.bat @@ -1,5 +1,3 @@ -git tag v0.3.10 - git tag api/v0.0.5 --force git tag cache/redis/v0.0.5 --force @@ -28,4 +26,6 @@ git tag registry/polaris/v0.0.5 --force git tag registry/servicecomb/v0.0.5 --force git tag registry/zookeeper/v0.0.5 --force +git tag v0.3.12 + git push origin --tags diff --git a/upgrade.bat b/upgrade.bat index 3833173..1e43c0f 100644 --- a/upgrade.bat +++ b/upgrade.bat @@ -1,6 +1,3 @@ -go get all -go mod tidy - cd api go get all go mod tidy @@ -88,3 +85,6 @@ go mod tidy cd ../zookeeper go get all go mod tidy + +go get all +go mod tidy