diff --git a/bootstrap/go.mod b/bootstrap/go.mod index a09719f..b4b0953 100644 --- a/bootstrap/go.mod +++ b/bootstrap/go.mod @@ -9,15 +9,12 @@ replace ( github.com/imdario/mergo => dario.cat/mergo v0.3.16 github.com/tx7do/kratos-bootstrap/api => ../api - github.com/tx7do/kratos-bootstrap/utils => ../utils github.com/tx7do/kratos-bootstrap/config => ../config github.com/tx7do/kratos-bootstrap/logger => ../logger github.com/tx7do/kratos-bootstrap/registry => ../registry github.com/tx7do/kratos-bootstrap/tracer => ../tracer - github.com/tx7do/kratos-bootstrap/rpc => ../rpc - github.com/tx7do/kratos-bootstrap/cache/redis => ../cache/redis - github.com/tx7do/kratos-bootstrap/oss/minio => ../oss/minio + github.com/tx7do/kratos-bootstrap/utils => ../utils ) require ( @@ -26,6 +23,11 @@ require ( github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.8.1 github.com/tx7do/kratos-bootstrap/api v0.0.5 + github.com/tx7do/kratos-bootstrap/config v0.0.5 + github.com/tx7do/kratos-bootstrap/logger v0.0.5 + github.com/tx7do/kratos-bootstrap/registry v0.0.5 + github.com/tx7do/kratos-bootstrap/tracer v0.0.5 + github.com/tx7do/kratos-bootstrap/utils v0.1.0 golang.org/x/tools v0.27.0 ) @@ -130,23 +132,6 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.11 // indirect github.com/tinylib/msgp v1.2.4 // indirect - github.com/tx7do/kratos-bootstrap/config/apollo v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/config/consul v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/config/etcd v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/config/kubernetes v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/config/nacos v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/config/polaris v0.0.1 // indirect - github.com/tx7do/kratos-bootstrap/logger/fluent v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/logger/logrus v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/logger/tencent v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/logger/zap v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/registry/consul v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/registry/etcd v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/registry/eureka v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/registry/kubernetes v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/registry/nacos v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/registry/servicecomb v0.0.5 // indirect - github.com/tx7do/kratos-bootstrap/registry/zookeeper v0.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect go.etcd.io/etcd/api/v3 v3.5.17 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect @@ -173,8 +158,8 @@ require ( golang.org/x/term v0.26.0 // indirect golang.org/x/text v0.20.0 // indirect golang.org/x/time v0.8.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect google.golang.org/grpc v1.68.0 // indirect google.golang.org/protobuf v1.35.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/bootstrap/go.sum b/bootstrap/go.sum index 9134ec8..c4c70a0 100644 --- a/bootstrap/go.sum +++ b/bootstrap/go.sum @@ -224,9 +224,8 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -430,9 +429,8 @@ github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= -github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -544,8 +542,8 @@ github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -565,42 +563,6 @@ github.com/tevid/gohamcrest v1.1.1/go.mod h1:3UvtWlqm8j5JbwYZh80D/PVBt0mJ1eJiYgZ github.com/tinylib/msgp v1.2.4 h1:yLFeUGostXXSGW5vxfT5dXG/qzkn4schv2I7at5+hVU= github.com/tinylib/msgp v1.2.4/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tx7do/kratos-bootstrap v0.3.14 h1:69ClKEnJQowSr8aSEstP7l0Ai6sJOkGRc4pbke0qAn4= -github.com/tx7do/kratos-bootstrap v0.3.14/go.mod h1:eVFDNWFaJGQ6d5fiJ2CHCWRnNXO2/bNgXg/EYR+n+ZU= -github.com/tx7do/kratos-bootstrap/config/apollo v0.0.5 h1:Db+T9pUvnMhK0bwG23D/zL4OZSzG36bhmspBcX9T+1E= -github.com/tx7do/kratos-bootstrap/config/apollo v0.0.5/go.mod h1:LBgnaSTOs4ZV09AFIdE1Bdo8pxV5Nnw04uFIR1L/YB4= -github.com/tx7do/kratos-bootstrap/config/consul v0.0.5 h1:KmOylOrzHXRzZUMDAlV7MNqkvgMjthhp4Jh6qAFp0gA= -github.com/tx7do/kratos-bootstrap/config/consul v0.0.5/go.mod h1:X5IKWK/dIZrZBpLbcEJyvadjpSX4g9tZ6tkPlRWT3Tw= -github.com/tx7do/kratos-bootstrap/config/etcd v0.0.5 h1:JNIIuoMEBLEtR7jwkMyyTkVuJXhVuxVsu2RQ7iQ8BE8= -github.com/tx7do/kratos-bootstrap/config/etcd v0.0.5/go.mod h1:pq5qjPad+it5VT8bEa7gSty3z2cu0FHpYRPrFdeJ7O8= -github.com/tx7do/kratos-bootstrap/config/kubernetes v0.0.5 h1:ysuSjkOVrI2mSzXZ1/NRmYy1cm6HAB7RMLLgKJuRpgg= -github.com/tx7do/kratos-bootstrap/config/kubernetes v0.0.5/go.mod h1:CoXSsoa4XkJFU+7PRKOHO+IK0GIjYuRx1Atpw1yfkMs= -github.com/tx7do/kratos-bootstrap/config/nacos v0.0.5 h1:j1+yLzJrUxzEuGMJNWXZtNO8UYbLcWtKQ7/px/MEUGc= -github.com/tx7do/kratos-bootstrap/config/nacos v0.0.5/go.mod h1:NT7nAuZuJVcd0PE+wbaO1fAFFl61/HW9DMCkWn59frA= -github.com/tx7do/kratos-bootstrap/config/polaris v0.0.1 h1:t42aizdIbFtWgLjq/ByrqknI5YBEVePZ0siPRk5q/9s= -github.com/tx7do/kratos-bootstrap/config/polaris v0.0.1/go.mod h1:4W2bRnoKBg7lot5N0Y8FyHLARPdB9gk/EbzBBzZHjwQ= -github.com/tx7do/kratos-bootstrap/logger/fluent v0.0.5 h1:+U1iDGd0/50lJVBoRviQ/5VtW31pkkuX/xNnrUC55q8= -github.com/tx7do/kratos-bootstrap/logger/fluent v0.0.5/go.mod h1:smB6HyirXlRKr3nYbr8StujnH+kAXTAijxxnFjWLKzQ= -github.com/tx7do/kratos-bootstrap/logger/logrus v0.0.5 h1:krN33gY1O9zAfK3ZEWUah2zK4UXsq5KzQe17u/of4QY= -github.com/tx7do/kratos-bootstrap/logger/logrus v0.0.5/go.mod h1:WADAPBDHS2ZsOTq/TVhGZb+HHtu/Ma6fvcQP0P7o+Ls= -github.com/tx7do/kratos-bootstrap/logger/tencent v0.0.5 h1:WgPLVNWvrb6mAcRY8UiJdjnyvjzc1VoFgK9ItOO55fY= -github.com/tx7do/kratos-bootstrap/logger/tencent v0.0.5/go.mod h1:t0vavjl77LhtAfZdkSvfOLZZPved1TuKXomTQ5ZbdpE= -github.com/tx7do/kratos-bootstrap/logger/zap v0.0.5 h1:IHD2rDQIVrt9iQhN4eEq3g/yMTRNdUPlfn6aP9GytCM= -github.com/tx7do/kratos-bootstrap/logger/zap v0.0.5/go.mod h1:T3Ni1HBE8ulGQCibBTSB/nfvPVdo1GySQFnpHuB6a1c= -github.com/tx7do/kratos-bootstrap/registry/consul v0.0.5 h1:EF+SEROn2wymWMRU1OF0tuVUbAuYAfC0Snu1hUQlxzc= -github.com/tx7do/kratos-bootstrap/registry/consul v0.0.5/go.mod h1:/i2ieZMxeY1CUtsjC7PZWn4PJlA9Tdebd5wHR5v4huc= -github.com/tx7do/kratos-bootstrap/registry/etcd v0.0.5 h1:G57YW8AYBnP/UP0glvAjZ5DY/K26dCaGvQOQQZCiNmk= -github.com/tx7do/kratos-bootstrap/registry/etcd v0.0.5/go.mod h1:56YNBxoMNjTVa8/XcNHW8cH+CAwJ8XunJK4c2lN890I= -github.com/tx7do/kratos-bootstrap/registry/eureka v0.0.5 h1:ekWlghA/uC7IGCZIb9Oc9NGR10n6sRf+pX02vFac1Ts= -github.com/tx7do/kratos-bootstrap/registry/eureka v0.0.5/go.mod h1:07e1ckVzUNJUWc21B5RLyyfdws/O7gfL2nekC0ZVA8Y= -github.com/tx7do/kratos-bootstrap/registry/kubernetes v0.0.5 h1://7sU06B6AYyPegywkzTB6QZNqUyMVmDtxzprQ5/53Y= -github.com/tx7do/kratos-bootstrap/registry/kubernetes v0.0.5/go.mod h1:cXvcZ/htIl9RV9P7G23kzDzdd0r+Lzv4u9vJM/0EnSc= -github.com/tx7do/kratos-bootstrap/registry/nacos v0.0.5 h1:HvkO+NUWQRFZ5XDlMCoS0vIsQrWGZ3eYsnp17zJOLWs= -github.com/tx7do/kratos-bootstrap/registry/nacos v0.0.5/go.mod h1:lUUkK8u45YCcQHyYS6AraIklPlTntVzaQ7UAJTI7WKQ= -github.com/tx7do/kratos-bootstrap/registry/servicecomb v0.0.5 h1:FGoAtQB7G9UbUuwzWZ/lQZbTFwWoWMT3cw3nWgDD4pM= -github.com/tx7do/kratos-bootstrap/registry/servicecomb v0.0.5/go.mod h1:4WEXJOjAPMBWfnICknx8ia8XF23E7qjDVGaiL70QbZI= -github.com/tx7do/kratos-bootstrap/registry/zookeeper v0.0.5 h1:lI1ULLYQIzloQAD29S+e8CgNmwXBRo/P+SVoearlqQ8= -github.com/tx7do/kratos-bootstrap/registry/zookeeper v0.0.5/go.mod h1:n0qBmSAoD0nf/nRCYoh9BwQzfYTb4j1c57GlJulxfPQ= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= @@ -1001,10 +963,10 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1:M65LEviCfuZTfrfzwwEoxVtgvfkFkBUbFnRbxCXuXhU= +google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f h1:C1QccEa9kUwvMgEUORqQD9S17QesQijxjZ84sO82mfo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/tag.bat b/tag.bat index 4a8d9c3..30318ac 100644 --- a/tag.bat +++ b/tag.bat @@ -9,6 +9,7 @@ git tag config/v0.0.5 --force git tag logger/v0.0.5 --force git tag rpc/v0.0.5 --force git tag tracer/v0.0.5 --force +git tag database/v0.0.5 --force git tag bootstrap/v0.0.5 --force