feat: refactor go.mod.

Makefile

@@ -13,7 +13,7 @@ SRCS_MK := $(foreach dir, app, $(wildcard $(dir)/*/*/Makefile))
 
 # generate protobuf api go code
 api:
-	cd api
+	cd api && \
 	buf generate
 
 # show help

api/buf.yaml

@@ -1,9 +0,0 @@
-version: v1
-
-breaking:
-  use:
-    - FILE
-
-lint:
-  use:
-    - DEFAULT

api/gen/go/conf/v1/kratos_conf_client.pb.go

@@ -27,8 +27,8 @@ type Client struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Rest *Client_REST `protobuf:"bytes,1,opt,name=rest,proto3" json:"rest,omitempty"` // REST服务
-	Grpc *Client_GRPC `protobuf:"bytes,2,opt,name=grpc,proto3" json:"grpc,omitempty"` // gRPC服务
+	Rest *Client_REST `protobuf:"bytes,1,opt,name=rest,proto3,oneof" json:"rest,omitempty"` // REST服务
+	Grpc *Client_GRPC `protobuf:"bytes,2,opt,name=grpc,proto3,oneof" json:"grpc,omitempty"` // gRPC服务
 }
 
 func (x *Client) Reset() {
@@ -83,8 +83,9 @@ type Client_REST struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Timeout    *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` // 超时时间
-	Middleware *Middleware          `protobuf:"bytes,2,opt,name=middleware,proto3" json:"middleware,omitempty"`
+	Timeout    *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"`       // 超时时间
+	Middleware *Middleware          `protobuf:"bytes,2,opt,name=middleware,proto3" json:"middleware,omitempty"` // 中间件
+	Tls        *TLS                 `protobuf:"bytes,3,opt,name=tls,proto3" json:"tls,omitempty"`               // TLS配置
 }
 
 func (x *Client_REST) Reset() {
@@ -133,14 +134,22 @@ func (x *Client_REST) GetMiddleware() *Middleware {
 	return nil
 }
 
+func (x *Client_REST) GetTls() *TLS {
+	if x != nil {
+		return x.Tls
+	}
+	return nil
+}
+
 // gPRC
 type Client_GRPC struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Timeout    *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` // 超时时间
-	Middleware *Middleware          `protobuf:"bytes,2,opt,name=middleware,proto3" json:"middleware,omitempty"`
+	Timeout    *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"`       // 超时时间
+	Middleware *Middleware          `protobuf:"bytes,2,opt,name=middleware,proto3" json:"middleware,omitempty"` // 中间件
+	Tls        *TLS                 `protobuf:"bytes,3,opt,name=tls,proto3" json:"tls,omitempty"`               // TLS配置
 }
 
 func (x *Client_GRPC) Reset() {
@@ -189,6 +198,13 @@ func (x *Client_GRPC) GetMiddleware() *Middleware {
 	return nil
 }
 
+func (x *Client_GRPC) GetTls() *TLS {
+	if x != nil {
+		return x.Tls
+	}
+	return nil
+}
+
 var File_conf_v1_kratos_conf_client_proto protoreflect.FileDescriptor
 
 var file_conf_v1_kratos_conf_client_proto_rawDesc = []byte{
@@ -198,36 +214,43 @@ var file_conf_v1_kratos_conf_client_proto_rawDesc = []byte{
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69,
 	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76,
 	0x31, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x5f, 0x6d, 0x69,
-	0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb4,
-	0x02, 0x0a, 0x06, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x72, 0x65, 0x73,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x43,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x45, 0x53, 0x54, 0x52, 0x04, 0x72, 0x65, 0x73, 0x74,
-	0x12, 0x25, 0x0a, 0x04, 0x67, 0x72, 0x70, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x47, 0x52, 0x50,
-	0x43, 0x52, 0x04, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x6d, 0x0a, 0x04, 0x52, 0x45, 0x53, 0x54, 0x12,
-	0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d,
-	0x65, 0x6f, 0x75, 0x74, 0x12, 0x30, 0x0a, 0x0a, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61,
-	0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e,
-	0x4d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x52, 0x0a, 0x6d, 0x69, 0x64, 0x64,
-	0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x1a, 0x6d, 0x0a, 0x04, 0x47, 0x52, 0x50, 0x43, 0x12, 0x33,
-	0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x12, 0x30, 0x0a, 0x0a, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4d,
-	0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x52, 0x0a, 0x6d, 0x69, 0x64, 0x64, 0x6c,
-	0x65, 0x77, 0x61, 0x72, 0x65, 0x42, 0x87, 0x01, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x42, 0x15, 0x4b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x43, 0x6c,
-	0x69, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x78, 0x37, 0x64, 0x6f, 0x2f, 0x6b, 0x72,
-	0x61, 0x74, 0x6f, 0x73, 0x2d, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2f, 0x61,
-	0x70, 0x69, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76,
-	0x31, 0xa2, 0x02, 0x03, 0x43, 0x58, 0x58, 0xaa, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xca, 0x02,
-	0x04, 0x43, 0x6f, 0x6e, 0x66, 0xe2, 0x02, 0x10, 0x43, 0x6f, 0x6e, 0x66, 0x5c, 0x47, 0x50, 0x42,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d,
+	0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x5f, 0x74, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8c, 0x03,
+	0x0a, 0x06, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x04, 0x72, 0x65, 0x73, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x43, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x45, 0x53, 0x54, 0x48, 0x00, 0x52, 0x04, 0x72, 0x65, 0x73,
+	0x74, 0x88, 0x01, 0x01, 0x12, 0x2a, 0x0a, 0x04, 0x67, 0x72, 0x70, 0x63, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x2e, 0x47, 0x52, 0x50, 0x43, 0x48, 0x01, 0x52, 0x04, 0x67, 0x72, 0x70, 0x63, 0x88, 0x01, 0x01,
+	0x1a, 0x8a, 0x01, 0x0a, 0x04, 0x52, 0x45, 0x53, 0x54, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d,
+	0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x30,
+	0x0a, 0x0a, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4d, 0x69, 0x64, 0x64, 0x6c, 0x65,
+	0x77, 0x61, 0x72, 0x65, 0x52, 0x0a, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65,
+	0x12, 0x1b, 0x0a, 0x03, 0x74, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x54, 0x4c, 0x53, 0x52, 0x03, 0x74, 0x6c, 0x73, 0x1a, 0x8a, 0x01,
+	0x0a, 0x04, 0x47, 0x52, 0x50, 0x43, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x30, 0x0a, 0x0a, 0x6d,
+	0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x10, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72,
+	0x65, 0x52, 0x0a, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x12, 0x1b, 0x0a,
+	0x03, 0x74, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x2e, 0x54, 0x4c, 0x53, 0x52, 0x03, 0x74, 0x6c, 0x73, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x72,
+	0x65, 0x73, 0x74, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x42, 0x87, 0x01, 0x0a,
+	0x08, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x42, 0x15, 0x4b, 0x72, 0x61, 0x74, 0x6f,
+	0x73, 0x43, 0x6f, 0x6e, 0x66, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74,
+	0x78, 0x37, 0x64, 0x6f, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x62, 0x6f, 0x6f, 0x74,
+	0x73, 0x74, 0x72, 0x61, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f,
+	0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x58, 0x58, 0xaa, 0x02,
+	0x04, 0x43, 0x6f, 0x6e, 0x66, 0xca, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xe2, 0x02, 0x10, 0x43,
+	0x6f, 0x6e, 0x66, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
+	0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -249,19 +272,22 @@ var file_conf_v1_kratos_conf_client_proto_goTypes = []interface{}{
 	(*Client_GRPC)(nil),         // 2: conf.Client.GRPC
 	(*durationpb.Duration)(nil), // 3: google.protobuf.Duration
 	(*Middleware)(nil),          // 4: conf.Middleware
+	(*TLS)(nil),                 // 5: conf.TLS
 }
 var file_conf_v1_kratos_conf_client_proto_depIdxs = []int32{
 	1, // 0: conf.Client.rest:type_name -> conf.Client.REST
 	2, // 1: conf.Client.grpc:type_name -> conf.Client.GRPC
 	3, // 2: conf.Client.REST.timeout:type_name -> google.protobuf.Duration
 	4, // 3: conf.Client.REST.middleware:type_name -> conf.Middleware
-	3, // 4: conf.Client.GRPC.timeout:type_name -> google.protobuf.Duration
-	4, // 5: conf.Client.GRPC.middleware:type_name -> conf.Middleware
-	6, // [6:6] is the sub-list for method output_type
-	6, // [6:6] is the sub-list for method input_type
-	6, // [6:6] is the sub-list for extension type_name
-	6, // [6:6] is the sub-list for extension extendee
-	0, // [0:6] is the sub-list for field type_name
+	5, // 4: conf.Client.REST.tls:type_name -> conf.TLS
+	3, // 5: conf.Client.GRPC.timeout:type_name -> google.protobuf.Duration
+	4, // 6: conf.Client.GRPC.middleware:type_name -> conf.Middleware
+	5, // 7: conf.Client.GRPC.tls:type_name -> conf.TLS
+	8, // [8:8] is the sub-list for method output_type
+	8, // [8:8] is the sub-list for method input_type
+	8, // [8:8] is the sub-list for extension type_name
+	8, // [8:8] is the sub-list for extension extendee
+	0, // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_conf_v1_kratos_conf_client_proto_init() }
@@ -270,6 +296,7 @@ func file_conf_v1_kratos_conf_client_proto_init() {
 		return
 	}
 	file_conf_v1_kratos_conf_middleware_proto_init()
+	file_conf_v1_kratos_conf_tls_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_conf_v1_kratos_conf_client_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Client); i {
@@ -308,6 +335,7 @@ func file_conf_v1_kratos_conf_client_proto_init() {
 			}
 		}
 	}
+	file_conf_v1_kratos_conf_client_proto_msgTypes[0].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{

api/gen/go/conf/v1/kratos_conf_config.pb.go

@@ -27,13 +27,13 @@ type RemoteConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Type       string                   `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	Etcd       *RemoteConfig_Etcd       `protobuf:"bytes,2,opt,name=etcd,proto3" json:"etcd,omitempty"`
-	Consul     *RemoteConfig_Consul     `protobuf:"bytes,3,opt,name=consul,proto3" json:"consul,omitempty"`
-	Nacos      *RemoteConfig_Nacos      `protobuf:"bytes,4,opt,name=nacos,proto3" json:"nacos,omitempty"`
-	Apollo     *RemoteConfig_Apollo     `protobuf:"bytes,6,opt,name=apollo,proto3" json:"apollo,omitempty"`
-	Kubernetes *RemoteConfig_Kubernetes `protobuf:"bytes,7,opt,name=kubernetes,proto3" json:"kubernetes,omitempty"`
-	Polaris    *RemoteConfig_Polaris    `protobuf:"bytes,8,opt,name=polaris,proto3" json:"polaris,omitempty"`
+	Type       string                   `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` // 配置类型
+	Etcd       *RemoteConfig_Etcd       `protobuf:"bytes,2,opt,name=etcd,proto3,oneof" json:"etcd,omitempty"`
+	Consul     *RemoteConfig_Consul     `protobuf:"bytes,3,opt,name=consul,proto3,oneof" json:"consul,omitempty"`
+	Nacos      *RemoteConfig_Nacos      `protobuf:"bytes,4,opt,name=nacos,proto3,oneof" json:"nacos,omitempty"`
+	Apollo     *RemoteConfig_Apollo     `protobuf:"bytes,6,opt,name=apollo,proto3,oneof" json:"apollo,omitempty"`
+	Kubernetes *RemoteConfig_Kubernetes `protobuf:"bytes,7,opt,name=kubernetes,proto3,oneof" json:"kubernetes,omitempty"`
+	Polaris    *RemoteConfig_Polaris    `protobuf:"bytes,8,opt,name=polaris,proto3,oneof" json:"polaris,omitempty"`
 }
 
 func (x *RemoteConfig) Reset() {
@@ -124,7 +124,7 @@ type RemoteConfig_Nacos struct {
 
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // 服务端地址
 	Port    uint64 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`      // 服务端端口
-	Key     string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`         //
+	Key     string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`         // 配置键
 }
 
 func (x *RemoteConfig_Nacos) Reset() {
@@ -185,9 +185,9 @@ type RemoteConfig_Etcd struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Endpoints []string             `protobuf:"bytes,1,rep,name=endpoints,proto3" json:"endpoints,omitempty"`
-	Timeout   *durationpb.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"`
-	Key       string               `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"` //
+	Endpoints []string             `protobuf:"bytes,1,rep,name=endpoints,proto3" json:"endpoints,omitempty"` // 服务端地址
+	Timeout   *durationpb.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"`     // 超时时间
+	Key       string               `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`             // 配置键
 }
 
 func (x *RemoteConfig_Etcd) Reset() {
@@ -250,7 +250,7 @@ type RemoteConfig_Consul struct {
 
 	Scheme  string `protobuf:"bytes,1,opt,name=scheme,proto3" json:"scheme,omitempty"`   // 网络样式
 	Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` // 服务端地址
-	Key     string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`         //
+	Key     string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`         // 配置键
 }
 
 func (x *RemoteConfig_Consul) Reset() {
@@ -311,11 +311,11 @@ type RemoteConfig_Apollo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Endpoint  string `protobuf:"bytes,1,opt,name=endpoint,proto3" json:"endpoint,omitempty"`
-	AppId     string `protobuf:"bytes,2,opt,name=app_id,json=appId,proto3" json:"app_id,omitempty"`
-	Cluster   string `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`
-	Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	Secret    string `protobuf:"bytes,5,opt,name=secret,proto3" json:"secret,omitempty"`
+	Endpoint  string `protobuf:"bytes,1,opt,name=endpoint,proto3" json:"endpoint,omitempty"`        // 服务端地址
+	AppId     string `protobuf:"bytes,2,opt,name=app_id,json=appId,proto3" json:"app_id,omitempty"` // 应用ID
+	Cluster   string `protobuf:"bytes,3,opt,name=cluster,proto3" json:"cluster,omitempty"`          // 集群
+	Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"`      // 命名空间
+	Secret    string `protobuf:"bytes,5,opt,name=secret,proto3" json:"secret,omitempty"`            // 密钥
 }
 
 func (x *RemoteConfig_Apollo) Reset() {
@@ -390,7 +390,7 @@ type RemoteConfig_Kubernetes struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` // 命名空间
 }
 
 func (x *RemoteConfig_Kubernetes) Reset() {
@@ -477,66 +477,73 @@ var file_conf_v1_kratos_conf_config_proto_rawDesc = []byte{
 	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x12, 0x04, 0x63, 0x6f, 0x6e, 0x66, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa3, 0x06, 0x0a, 0x0c, 0x52, 0x65, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85, 0x07, 0x0a, 0x0c, 0x52, 0x65, 0x6d,
 	0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x2b, 0x0a,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x30, 0x0a,
 	0x04, 0x65, 0x74, 0x63, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x45, 0x74, 0x63, 0x64, 0x52, 0x04, 0x65, 0x74, 0x63, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x12, 0x2e, 0x0a,
-	0x05, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63,
+	0x45, 0x74, 0x63, 0x64, 0x48, 0x00, 0x52, 0x04, 0x65, 0x74, 0x63, 0x64, 0x88, 0x01, 0x01, 0x12,
+	0x36, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x48, 0x01, 0x52, 0x06, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, 0x05, 0x6e, 0x61, 0x63, 0x6f, 0x73,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x52, 0x65,
+	0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4e, 0x61, 0x63, 0x6f, 0x73,
+	0x48, 0x02, 0x52, 0x05, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x88, 0x01, 0x01, 0x12, 0x36, 0x0a, 0x06,
+	0x61, 0x70, 0x6f, 0x6c, 0x6c, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63,
 	0x6f, 0x6e, 0x66, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x4e, 0x61, 0x63, 0x6f, 0x73, 0x52, 0x05, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x12, 0x31, 0x0a,
-	0x06, 0x61, 0x70, 0x6f, 0x6c, 0x6c, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x41, 0x70, 0x6f, 0x6c, 0x6c, 0x6f, 0x52, 0x06, 0x61, 0x70, 0x6f, 0x6c, 0x6c, 0x6f,
-	0x12, 0x3d, 0x0a, 0x0a, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x52, 0x65, 0x6d, 0x6f,
-	0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65,
-	0x74, 0x65, 0x73, 0x52, 0x0a, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x12,
-	0x34, 0x0a, 0x07, 0x70, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x50, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x52, 0x07, 0x70, 0x6f,
-	0x6c, 0x61, 0x72, 0x69, 0x73, 0x1a, 0x47, 0x0a, 0x05, 0x4e, 0x61, 0x63, 0x6f, 0x73, 0x12, 0x18,
-	0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x1a, 0x6b,
-	0x0a, 0x04, 0x45, 0x74, 0x63, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x65, 0x6e, 0x64, 0x70, 0x6f,
-	0x69, 0x6e, 0x74, 0x73, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x1a, 0x4c, 0x0a, 0x06, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x12, 0x18, 0x0a,
-	0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x1a, 0x8b, 0x01, 0x0a, 0x06, 0x41, 0x70,
-	0x6f, 0x6c, 0x6c, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-	0x12, 0x15, 0x0a, 0x06, 0x61, 0x70, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
-	0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x1a, 0x2a, 0x0a, 0x0a, 0x4b, 0x75, 0x62, 0x65, 0x72,
-	0x6e, 0x65, 0x74, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x1a, 0x09, 0x0a, 0x07, 0x50, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x42, 0x87,
-	0x01, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x42, 0x15, 0x4b, 0x72, 0x61,
-	0x74, 0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x74, 0x78, 0x37, 0x64, 0x6f, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x62, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x65, 0x6e, 0x2f,
-	0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x58, 0x58,
-	0xaa, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xca, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xe2, 0x02,
-	0x10, 0x43, 0x6f, 0x6e, 0x66, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0xea, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x41, 0x70, 0x6f, 0x6c, 0x6c, 0x6f, 0x48, 0x03, 0x52, 0x06, 0x61, 0x70, 0x6f, 0x6c, 0x6c,
+	0x6f, 0x88, 0x01, 0x01, 0x12, 0x42, 0x0a, 0x0a, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74,
+	0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e,
+	0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4b, 0x75, 0x62,
+	0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x48, 0x04, 0x52, 0x0a, 0x6b, 0x75, 0x62, 0x65, 0x72,
+	0x6e, 0x65, 0x74, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x39, 0x0a, 0x07, 0x70, 0x6f, 0x6c, 0x61,
+	0x72, 0x69, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x50, 0x6f,
+	0x6c, 0x61, 0x72, 0x69, 0x73, 0x48, 0x05, 0x52, 0x07, 0x70, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73,
+	0x88, 0x01, 0x01, 0x1a, 0x47, 0x0a, 0x05, 0x4e, 0x61, 0x63, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07,
+	0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x1a, 0x6b, 0x0a, 0x04,
+	0x45, 0x74, 0x63, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x73, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07,
+	0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x1a, 0x4c, 0x0a, 0x06, 0x43, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x1a, 0x8b, 0x01, 0x0a, 0x06, 0x41, 0x70, 0x6f, 0x6c,
+	0x6c, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x15,
+	0x0a, 0x06, 0x61, 0x70, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12,
+	0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x16, 0x0a,
+	0x06, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73,
+	0x65, 0x63, 0x72, 0x65, 0x74, 0x1a, 0x2a, 0x0a, 0x0a, 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65,
+	0x74, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x1a, 0x09, 0x0a, 0x07, 0x50, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x42, 0x07, 0x0a, 0x05,
+	0x5f, 0x65, 0x74, 0x63, 0x64, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x61,
+	0x70, 0x6f, 0x6c, 0x6c, 0x6f, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e,
+	0x65, 0x74, 0x65, 0x73, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73,
+	0x42, 0x87, 0x01, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x42, 0x15, 0x4b,
+	0x72, 0x61, 0x74, 0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x74, 0x78, 0x37, 0x64, 0x6f, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d,
+	0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x65,
+	0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43,
+	0x58, 0x58, 0xaa, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xca, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66,
+	0xe2, 0x02, 0x10, 0x43, 0x6f, 0x6e, 0x66, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0xea, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -668,6 +675,7 @@ func file_conf_v1_kratos_conf_config_proto_init() {
 			}
 		}
 	}
+	file_conf_v1_kratos_conf_config_proto_msgTypes[0].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{

api/gen/go/conf/v1/kratos_conf_logger.pb.go

@@ -27,11 +27,11 @@ type Logger struct {
 	unknownFields protoimpl.UnknownFields
 
 	Type    string          `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	Zap     *Logger_Zap     `protobuf:"bytes,2,opt,name=zap,proto3" json:"zap,omitempty"`
-	Logrus  *Logger_Logrus  `protobuf:"bytes,3,opt,name=logrus,proto3" json:"logrus,omitempty"`
-	Fluent  *Logger_Fluent  `protobuf:"bytes,4,opt,name=fluent,proto3" json:"fluent,omitempty"`
-	Aliyun  *Logger_Aliyun  `protobuf:"bytes,5,opt,name=aliyun,proto3" json:"aliyun,omitempty"`
-	Tencent *Logger_Tencent `protobuf:"bytes,6,opt,name=tencent,proto3" json:"tencent,omitempty"`
+	Zap     *Logger_Zap     `protobuf:"bytes,2,opt,name=zap,proto3,oneof" json:"zap,omitempty"`
+	Logrus  *Logger_Logrus  `protobuf:"bytes,3,opt,name=logrus,proto3,oneof" json:"logrus,omitempty"`
+	Fluent  *Logger_Fluent  `protobuf:"bytes,4,opt,name=fluent,proto3,oneof" json:"fluent,omitempty"`
+	Aliyun  *Logger_Aliyun  `protobuf:"bytes,5,opt,name=aliyun,proto3,oneof" json:"aliyun,omitempty"`
+	Tencent *Logger_Tencent `protobuf:"bytes,6,opt,name=tencent,proto3,oneof" json:"tencent,omitempty"`
 }
 
 func (x *Logger) Reset() {
@@ -465,72 +465,77 @@ var File_conf_v1_kratos_conf_logger_proto protoreflect.FileDescriptor
 var file_conf_v1_kratos_conf_logger_proto_rawDesc = []byte{
 	0x0a, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73,
 	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x5f, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x04, 0x63, 0x6f, 0x6e, 0x66, 0x22, 0xf6, 0x06, 0x0a, 0x06, 0x4c, 0x6f, 0x67,
+	0x74, 0x6f, 0x12, 0x04, 0x63, 0x6f, 0x6e, 0x66, 0x22, 0xc4, 0x07, 0x0a, 0x06, 0x4c, 0x6f, 0x67,
 	0x67, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x03, 0x7a, 0x61, 0x70, 0x18, 0x02,
+	0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x27, 0x0a, 0x03, 0x7a, 0x61, 0x70, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4c, 0x6f, 0x67, 0x67,
-	0x65, 0x72, 0x2e, 0x5a, 0x61, 0x70, 0x52, 0x03, 0x7a, 0x61, 0x70, 0x12, 0x2b, 0x0a, 0x06, 0x6c,
-	0x6f, 0x67, 0x72, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x67, 0x72, 0x75, 0x73,
-	0x52, 0x06, 0x6c, 0x6f, 0x67, 0x72, 0x75, 0x73, 0x12, 0x2b, 0x0a, 0x06, 0x66, 0x6c, 0x75, 0x65,
-	0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e,
-	0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x46, 0x6c, 0x75, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x66,
-	0x6c, 0x75, 0x65, 0x6e, 0x74, 0x12, 0x2b, 0x0a, 0x06, 0x61, 0x6c, 0x69, 0x79, 0x75, 0x6e, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4c, 0x6f, 0x67,
-	0x67, 0x65, 0x72, 0x2e, 0x41, 0x6c, 0x69, 0x79, 0x75, 0x6e, 0x52, 0x06, 0x61, 0x6c, 0x69, 0x79,
-	0x75, 0x6e, 0x12, 0x2e, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65,
-	0x72, 0x2e, 0x54, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x74, 0x65, 0x6e, 0x63, 0x65,
-	0x6e, 0x74, 0x1a, 0x8c, 0x01, 0x0a, 0x03, 0x5a, 0x61, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69,
-	0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69,
-	0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08,
-	0x6d, 0x61, 0x78, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x6d, 0x61, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6d, 0x61, 0x78, 0x5f, 0x61,
-	0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6d, 0x61, 0x78, 0x41, 0x67, 0x65,
-	0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x73, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x78, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70,
-	0x73, 0x1a, 0xbb, 0x01, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x72, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05,
-	0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76,
-	0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72,
-	0x12, 0x29, 0x0a, 0x10, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x66, 0x6f,
-	0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x64,
-	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0d, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f,
-	0x72, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x69,
-	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x64,
-	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x1a,
-	0x24, 0x0a, 0x06, 0x46, 0x6c, 0x75, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64,
+	0x65, 0x72, 0x2e, 0x5a, 0x61, 0x70, 0x48, 0x00, 0x52, 0x03, 0x7a, 0x61, 0x70, 0x88, 0x01, 0x01,
+	0x12, 0x30, 0x0a, 0x06, 0x6c, 0x6f, 0x67, 0x72, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x4c,
+	0x6f, 0x67, 0x72, 0x75, 0x73, 0x48, 0x01, 0x52, 0x06, 0x6c, 0x6f, 0x67, 0x72, 0x75, 0x73, 0x88,
+	0x01, 0x01, 0x12, 0x30, 0x0a, 0x06, 0x66, 0x6c, 0x75, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72,
+	0x2e, 0x46, 0x6c, 0x75, 0x65, 0x6e, 0x74, 0x48, 0x02, 0x52, 0x06, 0x66, 0x6c, 0x75, 0x65, 0x6e,
+	0x74, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x06, 0x61, 0x6c, 0x69, 0x79, 0x75, 0x6e, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4c, 0x6f, 0x67, 0x67,
+	0x65, 0x72, 0x2e, 0x41, 0x6c, 0x69, 0x79, 0x75, 0x6e, 0x48, 0x03, 0x52, 0x06, 0x61, 0x6c, 0x69,
+	0x79, 0x75, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x6e,
+	0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x4c,
+	0x6f, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x54, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x48, 0x04, 0x52,
+	0x07, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x1a, 0x8c, 0x01, 0x0a, 0x03,
+	0x5a, 0x61, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x69, 0x7a,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x78, 0x53, 0x69, 0x7a, 0x65,
+	0x12, 0x17, 0x0a, 0x07, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x6d, 0x61, 0x78, 0x41, 0x67, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x78,
+	0x5f, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x6d, 0x61, 0x78, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x73, 0x1a, 0xbb, 0x01, 0x0a, 0x06, 0x4c,
+	0x6f, 0x67, 0x72, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x66,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x12, 0x29, 0x0a, 0x10, 0x74, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x46, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x64, 0x69,
+	0x73, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x64,
+	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x1a, 0x24, 0x0a, 0x06, 0x46, 0x6c, 0x75, 0x65,
+	0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x1a, 0x82,
+	0x01, 0x0a, 0x06, 0x41, 0x6c, 0x69, 0x79, 0x75, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64,
 	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x1a, 0x82, 0x01, 0x0a, 0x06, 0x41, 0x6c, 0x69, 0x79, 0x75, 0x6e,
-	0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07,
-	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70,
-	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12,
+	0x1d, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x23,
+	0x0a, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x1a, 0x84, 0x01, 0x0a, 0x07, 0x54, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x12,
+	0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x74,
+	0x6f, 0x70, 0x69, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74,
+	0x6f, 0x70, 0x69, 0x63, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
 	0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65,
 	0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f,
 	0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x1a, 0x84, 0x01, 0x0a, 0x07, 0x54,
-	0x65, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x49, 0x64, 0x12, 0x1d, 0x0a,
-	0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d,
-	0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65,
-	0x74, 0x42, 0x87, 0x01, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x42, 0x15,
-	0x4b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x78, 0x37, 0x64, 0x6f, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73,
-	0x2d, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67,
-	0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0xa2, 0x02, 0x03,
-	0x43, 0x58, 0x58, 0xaa, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xca, 0x02, 0x04, 0x43, 0x6f, 0x6e,
-	0x66, 0xe2, 0x02, 0x10, 0x43, 0x6f, 0x6e, 0x66, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x63, 0x65, 0x73, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x7a,
+	0x61, 0x70, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6c, 0x6f, 0x67, 0x72, 0x75, 0x73, 0x42, 0x09, 0x0a,
+	0x07, 0x5f, 0x66, 0x6c, 0x75, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x61, 0x6c, 0x69,
+	0x79, 0x75, 0x6e, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x42,
+	0x87, 0x01, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x42, 0x15, 0x4b, 0x72,
+	0x61, 0x74, 0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x74, 0x78, 0x37, 0x64, 0x6f, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x62,
+	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x65, 0x6e,
+	0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x58,
+	0x58, 0xaa, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xca, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xe2,
+	0x02, 0x10, 0x43, 0x6f, 0x6e, 0x66, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -646,6 +651,7 @@ func file_conf_v1_kratos_conf_logger_proto_init() {
 			}
 		}
 	}
+	file_conf_v1_kratos_conf_logger_proto_msgTypes[0].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{

api/gen/go/conf/v1/kratos_conf_oss.pb.go

@@ -73,13 +73,14 @@ type OSS_MinIO struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Endpoint     string `protobuf:"bytes,1,opt,name=endpoint,proto3" json:"endpoint,omitempty"`                             // 对端端口
-	AccessKey    string `protobuf:"bytes,2,opt,name=access_key,json=accessKey,proto3" json:"access_key,omitempty"`          // 访问密钥
-	SecretKey    string `protobuf:"bytes,3,opt,name=secret_key,json=secretKey,proto3" json:"secret_key,omitempty"`          // 密钥
-	Token        string `protobuf:"bytes,4,opt,name=token,proto3" json:"token,omitempty"`                                   // 令牌
-	UseSsl       bool   `protobuf:"varint,5,opt,name=use_ssl,json=useSsl,proto3" json:"use_ssl,omitempty"`                  // 使用SSL
-	UploadHost   string `protobuf:"bytes,6,opt,name=upload_host,json=uploadHost,proto3" json:"upload_host,omitempty"`       // 上传链接的主机名
-	DownloadHost string `protobuf:"bytes,7,opt,name=download_host,json=downloadHost,proto3" json:"download_host,omitempty"` // 下载链接的主机名
+	Endpoint     string `protobuf:"bytes,1,opt,name=endpoint,proto3" json:"endpoint,omitempty"`                              // 对端端口
+	AccessKey    string `protobuf:"bytes,2,opt,name=access_key,json=accessKey,proto3" json:"access_key,omitempty"`           // 访问密钥
+	SecretKey    string `protobuf:"bytes,3,opt,name=secret_key,json=secretKey,proto3" json:"secret_key,omitempty"`           // 密钥
+	Token        string `protobuf:"bytes,4,opt,name=token,proto3" json:"token,omitempty"`                                    // 令牌
+	UseSsl       bool   `protobuf:"varint,10,opt,name=use_ssl,json=useSsl,proto3" json:"use_ssl,omitempty"`                  // 使用SSL
+	Tls          *TLS   `protobuf:"bytes,11,opt,name=tls,proto3" json:"tls,omitempty"`                                       // TLS配置
+	UploadHost   string `protobuf:"bytes,20,opt,name=upload_host,json=uploadHost,proto3" json:"upload_host,omitempty"`       // 上传链接的主机名
+	DownloadHost string `protobuf:"bytes,21,opt,name=download_host,json=downloadHost,proto3" json:"download_host,omitempty"` // 下载链接的主机名
 }
 
 func (x *OSS_MinIO) Reset() {
@@ -149,6 +150,13 @@ func (x *OSS_MinIO) GetUseSsl() bool {
 	return false
 }
 
+func (x *OSS_MinIO) GetTls() *TLS {
+	if x != nil {
+		return x.Tls
+	}
+	return nil
+}
+
 func (x *OSS_MinIO) GetUploadHost() string {
 	if x != nil {
 		return x.UploadHost
@@ -168,32 +176,36 @@ var File_conf_v1_kratos_conf_oss_proto protoreflect.FileDescriptor
 var file_conf_v1_kratos_conf_oss_proto_rawDesc = []byte{
 	0x0a, 0x1d, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73,
 	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x5f, 0x6f, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x04, 0x63, 0x6f, 0x6e, 0x66, 0x22, 0x85, 0x02, 0x0a, 0x03, 0x4f, 0x53, 0x53, 0x12, 0x25, 0x0a,
-	0x05, 0x6d, 0x69, 0x6e, 0x69, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x2e, 0x4f, 0x53, 0x53, 0x2e, 0x4d, 0x69, 0x6e, 0x49, 0x4f, 0x52, 0x05, 0x6d,
-	0x69, 0x6e, 0x69, 0x6f, 0x1a, 0xd6, 0x01, 0x0a, 0x05, 0x4d, 0x69, 0x6e, 0x49, 0x4f, 0x12, 0x1a,
-	0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x63,
-	0x72, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65,
-	0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x17,
-	0x0a, 0x07, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x73, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x75, 0x73, 0x65, 0x53, 0x73, 0x6c, 0x12, 0x1f, 0x0a, 0x0b, 0x75, 0x70, 0x6c, 0x6f, 0x61,
-	0x64, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x75, 0x70,
-	0x6c, 0x6f, 0x61, 0x64, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x6f, 0x77, 0x6e,
-	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0c, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x6f, 0x73, 0x74, 0x42, 0x84, 0x01,
-	0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x42, 0x12, 0x4b, 0x72, 0x61, 0x74,
-	0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x4f, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x78, 0x37,
-	0x64, 0x6f, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74,
-	0x72, 0x61, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x63,
-	0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x58, 0x58, 0xaa, 0x02, 0x04, 0x43,
-	0x6f, 0x6e, 0x66, 0xca, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xe2, 0x02, 0x10, 0x43, 0x6f, 0x6e,
-	0x66, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x04,
-	0x43, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x04, 0x63, 0x6f, 0x6e, 0x66, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0x2f, 0x6b,
+	0x72, 0x61, 0x74, 0x6f, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x5f, 0x74, 0x6c, 0x73, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa2, 0x02, 0x0a, 0x03, 0x4f, 0x53, 0x53, 0x12, 0x25, 0x0a, 0x05,
+	0x6d, 0x69, 0x6e, 0x69, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x2e, 0x4f, 0x53, 0x53, 0x2e, 0x4d, 0x69, 0x6e, 0x49, 0x4f, 0x52, 0x05, 0x6d, 0x69,
+	0x6e, 0x69, 0x6f, 0x1a, 0xf3, 0x01, 0x0a, 0x05, 0x4d, 0x69, 0x6e, 0x49, 0x4f, 0x12, 0x1a, 0x0a,
+	0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63, 0x63,
+	0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x63, 0x72,
+	0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65,
+	0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x17, 0x0a,
+	0x07, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x73, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x75, 0x73, 0x65, 0x53, 0x73, 0x6c, 0x12, 0x1b, 0x0a, 0x03, 0x74, 0x6c, 0x73, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x54, 0x4c, 0x53, 0x52, 0x03,
+	0x74, 0x6c, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x68, 0x6f,
+	0x73, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64,
+	0x48, 0x6f, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64,
+	0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x6f, 0x77,
+	0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x6f, 0x73, 0x74, 0x42, 0x84, 0x01, 0x0a, 0x08, 0x63, 0x6f,
+	0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x42, 0x12, 0x4b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x43, 0x6f,
+	0x6e, 0x66, 0x4f, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x78, 0x37, 0x64, 0x6f, 0x2f, 0x6b,
+	0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2f,
+	0x61, 0x70, 0x69, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x2f,
+	0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x58, 0x58, 0xaa, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xca,
+	0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xe2, 0x02, 0x10, 0x43, 0x6f, 0x6e, 0x66, 0x5c, 0x47, 0x50,
+	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -212,14 +224,16 @@ var file_conf_v1_kratos_conf_oss_proto_msgTypes = make([]protoimpl.MessageInfo,
 var file_conf_v1_kratos_conf_oss_proto_goTypes = []interface{}{
 	(*OSS)(nil),       // 0: conf.OSS
 	(*OSS_MinIO)(nil), // 1: conf.OSS.MinIO
+	(*TLS)(nil),       // 2: conf.TLS
 }
 var file_conf_v1_kratos_conf_oss_proto_depIdxs = []int32{
 	1, // 0: conf.OSS.minio:type_name -> conf.OSS.MinIO
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	2, // 1: conf.OSS.MinIO.tls:type_name -> conf.TLS
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_conf_v1_kratos_conf_oss_proto_init() }
@@ -227,6 +241,7 @@ func file_conf_v1_kratos_conf_oss_proto_init() {
 	if File_conf_v1_kratos_conf_oss_proto != nil {
 		return
 	}
+	file_conf_v1_kratos_conf_tls_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_conf_v1_kratos_conf_oss_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*OSS); i {

api/gen/go/conf/v1/kratos_conf_tls.pb.go

@@ -0,0 +1,349 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.31.0
+// 	protoc        (unknown)
+// source: conf/v1/kratos_conf_tls.proto
+
+package v1
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type TLS struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	File               *TLS_File   `protobuf:"bytes,1,opt,name=file,proto3,oneof" json:"file,omitempty"`
+	Config             *TLS_Config `protobuf:"bytes,2,opt,name=config,proto3,oneof" json:"config,omitempty"`
+	InsecureSkipVerify bool        `protobuf:"varint,3,opt,name=insecure_skip_verify,json=insecureSkipVerify,proto3" json:"insecure_skip_verify,omitempty"`
+}
+
+func (x *TLS) Reset() {
+	*x = TLS{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_conf_v1_kratos_conf_tls_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TLS) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TLS) ProtoMessage() {}
+
+func (x *TLS) ProtoReflect() protoreflect.Message {
+	mi := &file_conf_v1_kratos_conf_tls_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TLS.ProtoReflect.Descriptor instead.
+func (*TLS) Descriptor() ([]byte, []int) {
+	return file_conf_v1_kratos_conf_tls_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *TLS) GetFile() *TLS_File {
+	if x != nil {
+		return x.File
+	}
+	return nil
+}
+
+func (x *TLS) GetConfig() *TLS_Config {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+func (x *TLS) GetInsecureSkipVerify() bool {
+	if x != nil {
+		return x.InsecureSkipVerify
+	}
+	return false
+}
+
+type TLS_File struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	CertPath *string `protobuf:"bytes,1,opt,name=cert_path,json=certPath,proto3,oneof" json:"cert_path,omitempty"`
+	KeyPath  *string `protobuf:"bytes,2,opt,name=key_path,json=keyPath,proto3,oneof" json:"key_path,omitempty"`
+	CaPath   *string `protobuf:"bytes,3,opt,name=ca_path,json=caPath,proto3,oneof" json:"ca_path,omitempty"`
+}
+
+func (x *TLS_File) Reset() {
+	*x = TLS_File{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_conf_v1_kratos_conf_tls_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TLS_File) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TLS_File) ProtoMessage() {}
+
+func (x *TLS_File) ProtoReflect() protoreflect.Message {
+	mi := &file_conf_v1_kratos_conf_tls_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TLS_File.ProtoReflect.Descriptor instead.
+func (*TLS_File) Descriptor() ([]byte, []int) {
+	return file_conf_v1_kratos_conf_tls_proto_rawDescGZIP(), []int{0, 0}
+}
+
+func (x *TLS_File) GetCertPath() string {
+	if x != nil && x.CertPath != nil {
+		return *x.CertPath
+	}
+	return ""
+}
+
+func (x *TLS_File) GetKeyPath() string {
+	if x != nil && x.KeyPath != nil {
+		return *x.KeyPath
+	}
+	return ""
+}
+
+func (x *TLS_File) GetCaPath() string {
+	if x != nil && x.CaPath != nil {
+		return *x.CaPath
+	}
+	return ""
+}
+
+type TLS_Config struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	CertPem []byte `protobuf:"bytes,1,opt,name=cert_pem,json=certPem,proto3,oneof" json:"cert_pem,omitempty"`
+	KeyPem  []byte `protobuf:"bytes,2,opt,name=key_pem,json=keyPem,proto3,oneof" json:"key_pem,omitempty"`
+	CaPem   []byte `protobuf:"bytes,3,opt,name=ca_pem,json=caPem,proto3,oneof" json:"ca_pem,omitempty"`
+}
+
+func (x *TLS_Config) Reset() {
+	*x = TLS_Config{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_conf_v1_kratos_conf_tls_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TLS_Config) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TLS_Config) ProtoMessage() {}
+
+func (x *TLS_Config) ProtoReflect() protoreflect.Message {
+	mi := &file_conf_v1_kratos_conf_tls_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TLS_Config.ProtoReflect.Descriptor instead.
+func (*TLS_Config) Descriptor() ([]byte, []int) {
+	return file_conf_v1_kratos_conf_tls_proto_rawDescGZIP(), []int{0, 1}
+}
+
+func (x *TLS_Config) GetCertPem() []byte {
+	if x != nil {
+		return x.CertPem
+	}
+	return nil
+}
+
+func (x *TLS_Config) GetKeyPem() []byte {
+	if x != nil {
+		return x.KeyPem
+	}
+	return nil
+}
+
+func (x *TLS_Config) GetCaPem() []byte {
+	if x != nil {
+		return x.CaPem
+	}
+	return nil
+}
+
+var File_conf_v1_kratos_conf_tls_proto protoreflect.FileDescriptor
+
+var file_conf_v1_kratos_conf_tls_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x5f, 0x74, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x04, 0x63, 0x6f, 0x6e, 0x66, 0x22, 0xbc, 0x03, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x27, 0x0a,
+	0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x2e, 0x54, 0x4c, 0x53, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x04, 0x66,
+	0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x54, 0x4c,
+	0x53, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72,
+	0x65, 0x5f, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x53, 0x6b, 0x69,
+	0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x1a, 0x8d, 0x01, 0x0a, 0x04, 0x46, 0x69, 0x6c, 0x65,
+	0x12, 0x20, 0x0a, 0x09, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08, 0x63, 0x65, 0x72, 0x74, 0x50, 0x61, 0x74, 0x68, 0x88,
+	0x01, 0x01, 0x12, 0x1e, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x50, 0x61, 0x74, 0x68, 0x88,
+	0x01, 0x01, 0x12, 0x1c, 0x0a, 0x07, 0x63, 0x61, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x06, 0x63, 0x61, 0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01,
+	0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x42, 0x0b,
+	0x0a, 0x09, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x42, 0x0a, 0x0a, 0x08, 0x5f,
+	0x63, 0x61, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x1a, 0x86, 0x01, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x1e, 0x0a, 0x08, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x70, 0x65, 0x6d, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x07, 0x63, 0x65, 0x72, 0x74, 0x50, 0x65, 0x6d, 0x88,
+	0x01, 0x01, 0x12, 0x1c, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x65, 0x6d, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0c, 0x48, 0x01, 0x52, 0x06, 0x6b, 0x65, 0x79, 0x50, 0x65, 0x6d, 0x88, 0x01, 0x01,
+	0x12, 0x1a, 0x0a, 0x06, 0x63, 0x61, 0x5f, 0x70, 0x65, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c,
+	0x48, 0x02, 0x52, 0x05, 0x63, 0x61, 0x50, 0x65, 0x6d, 0x88, 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09,
+	0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x70, 0x65, 0x6d, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6b, 0x65,
+	0x79, 0x5f, 0x70, 0x65, 0x6d, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x63, 0x61, 0x5f, 0x70, 0x65, 0x6d,
+	0x42, 0x07, 0x0a, 0x05, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x42, 0x84, 0x01, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x42, 0x12, 0x4b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x54, 0x6c, 0x73,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x78, 0x37, 0x64, 0x6f, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73,
+	0x2d, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67,
+	0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x76, 0x31, 0xa2, 0x02, 0x03,
+	0x43, 0x58, 0x58, 0xaa, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0xca, 0x02, 0x04, 0x43, 0x6f, 0x6e,
+	0x66, 0xe2, 0x02, 0x10, 0x43, 0x6f, 0x6e, 0x66, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x04, 0x43, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
+}
+
+var (
+	file_conf_v1_kratos_conf_tls_proto_rawDescOnce sync.Once
+	file_conf_v1_kratos_conf_tls_proto_rawDescData = file_conf_v1_kratos_conf_tls_proto_rawDesc
+)
+
+func file_conf_v1_kratos_conf_tls_proto_rawDescGZIP() []byte {
+	file_conf_v1_kratos_conf_tls_proto_rawDescOnce.Do(func() {
+		file_conf_v1_kratos_conf_tls_proto_rawDescData = protoimpl.X.CompressGZIP(file_conf_v1_kratos_conf_tls_proto_rawDescData)
+	})
+	return file_conf_v1_kratos_conf_tls_proto_rawDescData
+}
+
+var file_conf_v1_kratos_conf_tls_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_conf_v1_kratos_conf_tls_proto_goTypes = []interface{}{
+	(*TLS)(nil),        // 0: conf.TLS
+	(*TLS_File)(nil),   // 1: conf.TLS.File
+	(*TLS_Config)(nil), // 2: conf.TLS.Config
+}
+var file_conf_v1_kratos_conf_tls_proto_depIdxs = []int32{
+	1, // 0: conf.TLS.file:type_name -> conf.TLS.File
+	2, // 1: conf.TLS.config:type_name -> conf.TLS.Config
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_conf_v1_kratos_conf_tls_proto_init() }
+func file_conf_v1_kratos_conf_tls_proto_init() {
+	if File_conf_v1_kratos_conf_tls_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_conf_v1_kratos_conf_tls_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TLS); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_conf_v1_kratos_conf_tls_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TLS_File); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_conf_v1_kratos_conf_tls_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TLS_Config); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_conf_v1_kratos_conf_tls_proto_msgTypes[0].OneofWrappers = []interface{}{}
+	file_conf_v1_kratos_conf_tls_proto_msgTypes[1].OneofWrappers = []interface{}{}
+	file_conf_v1_kratos_conf_tls_proto_msgTypes[2].OneofWrappers = []interface{}{}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_conf_v1_kratos_conf_tls_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_conf_v1_kratos_conf_tls_proto_goTypes,
+		DependencyIndexes: file_conf_v1_kratos_conf_tls_proto_depIdxs,
+		MessageInfos:      file_conf_v1_kratos_conf_tls_proto_msgTypes,
+	}.Build()
+	File_conf_v1_kratos_conf_tls_proto = out.File
+	file_conf_v1_kratos_conf_tls_proto_rawDesc = nil
+	file_conf_v1_kratos_conf_tls_proto_goTypes = nil
+	file_conf_v1_kratos_conf_tls_proto_depIdxs = nil
+}

api/go.mod

@@ -6,7 +6,7 @@ toolchain go1.22.1
 
 require (
 	github.com/google/gnostic v0.7.0
-	google.golang.org/protobuf v1.34.0
+	google.golang.org/protobuf v1.35.1
 )
 
 require (

api/go.sum

@@ -1462,8 +1462,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
-google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

api/protos/conf/v1/kratos_conf_client.proto

@@ -5,22 +5,26 @@ package conf;
 option go_package = "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1;conf";
 
 import "google/protobuf/duration.proto";
+
 import "conf/v1/kratos_conf_middleware.proto";
+import "conf/v1/kratos_conf_tls.proto";
 
 // 客户端
 message Client {
   // REST
   message REST {
     google.protobuf.Duration timeout = 1; // 超时时间
-    Middleware middleware = 2;
+    Middleware middleware = 2; // 中间件
+    TLS tls = 3;  // TLS配置
   }
 
   // gPRC
   message GRPC {
     google.protobuf.Duration timeout = 1; // 超时时间
-    Middleware middleware = 2;
+    Middleware middleware = 2; // 中间件
+    TLS tls = 3;  // TLS配置
   }
 
-  REST rest = 1;  // REST服务
-  GRPC grpc = 2;  // gRPC服务
+  optional REST rest = 1;  // REST服务
+  optional GRPC grpc = 2;  // gRPC服务
 }

api/protos/conf/v1/kratos_conf_config.proto

@@ -11,43 +11,43 @@ message RemoteConfig {
   message Nacos {
     string address = 1; // 服务端地址
     uint64 port = 2; // 服务端端口
-    string key = 3; //
+    string key = 3; // 配置键
   }
 
   message Etcd {
-    repeated string endpoints = 1;
-    google.protobuf.Duration timeout = 2;
-    string key = 3; //
+    repeated string endpoints = 1; // 服务端地址
+    google.protobuf.Duration timeout = 2; // 超时时间
+    string key = 3; // 配置键
   }
 
   message Consul {
     string scheme = 1;  // 网络样式
     string address = 2; // 服务端地址
-    string key = 3; //
+    string key = 3; // 配置键
   }
 
   message Apollo {
-    string endpoint = 1;
-    string app_id = 2;
-    string cluster = 3;
-    string namespace = 4;
-    string secret = 5;
+    string endpoint = 1; // 服务端地址
+    string app_id = 2; // 应用ID
+    string cluster = 3; // 集群
+    string namespace = 4; // 命名空间
+    string secret = 5; // 密钥
   }
 
   message Kubernetes {
-    string namespace = 1;
+    string namespace = 1; // 命名空间
   }
 
   message Polaris {
 
   }
 
-  string type = 1;
+  string type = 1; // 配置类型
 
-  Etcd etcd = 2;
-  Consul consul = 3;
-  Nacos nacos = 4;
-  Apollo apollo = 6;
-  Kubernetes kubernetes = 7;
-  Polaris polaris = 8;
+  optional Etcd etcd = 2;
+  optional Consul consul = 3;
+  optional Nacos nacos = 4;
+  optional Apollo apollo = 6;
+  optional Kubernetes kubernetes = 7;
+  optional Polaris polaris = 8;
 }

api/protos/conf/v1/kratos_conf_data.proto

@@ -12,11 +12,15 @@ message Data {
   message Database {
     string driver = 1;  // 驱动名：mysql、postgresql、mongodb、sqlite……
     string source = 2;  // 数据源（DSN字符串）
-    bool migrate = 3; // 数据迁移开关
-    bool debug = 4; // 调试开关
-    int32 max_idle_connections = 5; // 连接池最大空闲连接数
-    int32 max_open_connections = 6; // 连接池最大打开连接数
-    google.protobuf.Duration connection_max_lifetime = 7; // 连接可重用的最大时间长度
+
+    bool migrate = 10; // 数据迁移开关
+    bool debug = 11; // 调试开关
+    bool enable_trace = 12; // 链路追踪开关
+    bool enable_metrics = 13; // 性能分析开关
+
+    int32 max_idle_connections = 20; // 连接池最大空闲连接数
+    int32 max_open_connections = 21; // 连接池最大打开连接数
+    google.protobuf.Duration connection_max_lifetime = 22; // 连接可重用的最大时间长度
   }
 
   // redis
@@ -71,19 +75,6 @@ message Data {
     string bucket = 4;
   }
 
-  // Kafka
-  message Kafka {
-    repeated string addrs = 1;  // 对端网络地址
-    string codec = 2;  // 编解码器
-    bool async = 3; // 异步发送
-    bool allow_auto_topic_creation = 4; // 允许发送的时候自动创建主题
-    int32 batch_size = 5; // 批量发送量
-    google.protobuf.Duration batch_timeout = 6; // 批量发送超时时间
-    google.protobuf.Duration read_timeout = 7; // 读取超时时间
-    google.protobuf.Duration write_timeout = 8; // 发送超时时间
-    int64 batch_bytes = 9;// 批量发送字节数
-  }
-
   message Doris {
     string address = 1;
   }
@@ -109,16 +100,94 @@ message Data {
     bool ignore_peer_addr = 10;
   }
 
-  Database database = 1;  // 数据库DSN
+  message Snowflake {
 
-  Redis redis = 10;  // Redis
-  MongoDB mongodb = 11;  // MongoDB数据库
-  ElasticSearch elastic_search = 12;  // ElasticSearch数据库
-  Cassandra cassandra = 13;  // Cassandra数据库
+  }
 
-  ClickHouse clickhouse = 20;  // ClickHouse数据库
-  InfluxDB influxdb = 21;  // InfluxDB数据库
-  Doris doris = 22;  // Doris数据库
+  // Kafka
+  message Kafka {
+    repeated string endpoints = 1;  // 对端网络地址
 
-  Kafka kafka = 30;  // Kafka服务
+    string codec = 2;  // 编解码器
+
+    bool async = 3; // 异步发送
+    bool allow_auto_topic_creation = 4; // 允许发送的时候自动创建主题
+
+    int32 batch_size = 5; // 批量发送量
+    int64 batch_bytes = 6;// 批量发送字节数
+
+    google.protobuf.Duration batch_timeout = 7; // 批量发送超时时间
+    google.protobuf.Duration read_timeout = 8; // 读取超时时间
+    google.protobuf.Duration write_timeout = 9; // 发送超时时间
+  }
+
+  // RabbitMQ
+  message RabbitMQ {
+    repeated string endpoints = 1;  // 对端网络地址
+  }
+
+  // MQTT
+  message Mqtt {
+    string endpoint = 1;  // 对端网络地址
+    string codec = 2;  // 编解码器: json,xml,yaml...
+  }
+
+  message ActiveMQ {
+    string endpoint = 1;  // 对端网络地址
+    string codec = 2;  // 编解码器: json,xml,yaml...
+  }
+
+  message NATS {
+    string endpoint = 1;  // 对端网络地址
+    string codec = 2;  // 编解码器: json,xml,yaml...
+  }
+
+  message NSQ {
+    string endpoint = 1;  // 对端网络地址
+    string codec = 2;  // 编解码器: json,xml,yaml...
+  }
+
+  message Pulsar {
+    string endpoint = 1;  // 对端网络地址
+    string codec = 2;  // 编解码器: json,xml,yaml...
+  }
+
+  message RocketMQ {
+    string version = 1; // 驱动版本：aliyun、v2、v5
+    string codec = 2;  // 编解码器: json,xml,yaml...
+    bool enable_trace = 3;
+
+    repeated string name_servers = 4;
+    string name_server_domain = 5;
+
+    string access_key = 6;
+    string secret_key = 7;
+    string security_token = 8;
+
+    string namespace = 9;
+    string instance_name = 10;
+    string group_name = 11;
+  }
+
+  optional Database database = 1;  // 数据库DSN
+
+  optional Redis redis = 10;  // Redis
+  optional MongoDB mongodb = 11;  // MongoDB数据库
+  optional ElasticSearch elastic_search = 12;  // ElasticSearch数据库
+  optional Cassandra cassandra = 13;  // Cassandra数据库
+
+  optional ClickHouse clickhouse = 20;  // ClickHouse数据库
+  optional InfluxDB influxdb = 21;  // InfluxDB数据库
+  optional Doris doris = 22;  // Doris数据库
+
+  // Message Queue
+
+  optional Kafka kafka = 30;  // Kafka服务
+  optional RabbitMQ rabbitmq = 31;  // RabbitMQ服务
+  optional Mqtt mqtt = 32;  // MQTT服务
+  optional ActiveMQ activemq = 33; // ActiveMQ
+  optional  NATS nats = 34; // NATS
+  optional NSQ nsq = 35; // NATS
+  optional Pulsar pulsar = 36; // Pulsar
+  optional RocketMQ rocketmq = 38; // RocketMQ
 }

api/protos/conf/v1/kratos_conf_logger.proto

@@ -47,9 +47,9 @@ message Logger {
 
   string type = 1;
 
-  Zap zap = 2;
-  Logrus logrus = 3;
-  Fluent fluent = 4;
-  Aliyun aliyun = 5;
-  Tencent tencent = 6;
+  optional Zap zap = 2;
+  optional Logrus logrus = 3;
+  optional Fluent fluent = 4;
+  optional Aliyun aliyun = 5;
+  optional Tencent tencent = 6;
 }

api/protos/conf/v1/kratos_conf_oss.proto

@@ -4,6 +4,8 @@ package conf;
 
 option go_package = "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1;conf";
 
+import "conf/v1/kratos_conf_tls.proto";
+
 message OSS {
   // MinIO
   message MinIO {
@@ -11,9 +13,12 @@ message OSS {
     string access_key = 2;  // 访问密钥
     string secret_key = 3;  // 密钥
     string token = 4; // 令牌
-    bool use_ssl = 5; // 使用SSL
-    string upload_host = 6;  // 上传链接的主机名
-    string download_host = 7;  // 下载链接的主机名
+
+    bool use_ssl = 10; // 使用SSL
+    TLS tls = 11;  // TLS配置
+
+    string upload_host = 20;  // 上传链接的主机名
+    string download_host = 21;  // 下载链接的主机名
   }
 
   MinIO minio = 1;

api/protos/conf/v1/kratos_conf_registry.proto

@@ -30,13 +30,18 @@ message Registry {
   message Nacos {
     string address = 1; // 服务端地址
     uint64 port = 2; // 服务端端口
+
     string namespace_id = 3; //
+
     string log_level = 4; // 日志等级
     string cache_dir = 5; // 缓存目录
     string log_dir = 6; // 日志目录
+
     int32 update_thread_num = 7; // 更新服务的线程数
+
     google.protobuf.Duration timeout = 8; // http请求超时时间，单位: 毫秒
     google.protobuf.Duration beat_interval = 9; // 心跳间隔时间，单位: 毫秒
+
     bool not_load_cache_at_start = 10; // 在启动时不读取本地缓存数据，true: 不读取，false: 读取
     bool update_cache_when_empty = 11; // 当服务列表为空时是否更新本地缓存，true: 更新,false: 不更新
   }

api/protos/conf/v1/kratos_conf_server.proto

@@ -5,7 +5,9 @@ package conf;
 option go_package = "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1;conf";
 
 import "google/protobuf/duration.proto";
+
 import "conf/v1/kratos_conf_middleware.proto";
+import "conf/v1/kratos_conf_tls.proto";
 
 // 服务器
 message Server {
@@ -20,18 +22,25 @@ message Server {
     string network = 1; // 网络
     string addr = 2;  // 服务监听地址
     google.protobuf.Duration timeout = 3; // 超时时间
-    CORS cors = 4;  // 服务监听地址
-    Middleware middleware = 5;  // 中间件
-    bool enable_swagger = 6;  // 启用SwaggerUI
-    bool enable_pprof = 7;  // 启用pprof
+
+    CORS cors = 10;  // 服务监听地址
+    Middleware middleware = 11;  // 中间件
+    TLS tls = 12;  // TLS配置
+
+    bool enable_swagger = 20;  // 启用SwaggerUI
+    bool enable_pprof = 21;  // 启用pprof
   }
 
   // gPRC
   message GRPC {
     string network = 1; // 网络
     string addr = 2;  // 服务监听地址
+
     google.protobuf.Duration timeout = 3; // 超时时间
+
     Middleware middleware = 4;
+
+    TLS tls = 5;  // TLS配置
   }
 
   // Websocket
@@ -41,51 +50,64 @@ message Server {
     string path = 3;  // 路径
     string codec = 4;  // 编解码器: json,xml,yaml...
     google.protobuf.Duration timeout = 5; // 超时时间
+    TLS tls = 6;  // TLS配置
   }
 
   // MQTT
   message Mqtt {
-    string addr = 1;  // 对端网络地址
+    string endpoint = 1;  // 对端网络地址
+    string codec = 2;  // 编解码器: json,xml,yaml...
+    TLS tls = 3;  // TLS配置
   }
 
   // Kafka
   message Kafka {
-    repeated string addrs = 1;  // 对端网络地址
+    repeated string endpoints = 1;  // 对端网络地址
+    string codec = 2;  // 编解码器: json,xml,yaml...
+    TLS tls = 3;  // TLS配置
   }
 
   // RabbitMQ
   message RabbitMQ {
-    repeated string addrs = 1;  // 对端网络地址
+    repeated string endpoints = 1;  // 对端网络地址
+    string codec = 2;  // 编解码器: json,xml,yaml...
+    TLS tls = 3;  // TLS配置
   }
 
   message ActiveMQ {
     string endpoint = 1;  // 对端网络地址
     string codec = 2;  // 编解码器: json,xml,yaml...
+    TLS tls = 3;  // TLS配置
   }
 
   message NATS {
     string endpoint = 1;  // 对端网络地址
     string codec = 2;  // 编解码器: json,xml,yaml...
+    TLS tls = 3;  // TLS配置
   }
 
   message NSQ {
     string endpoint = 1;  // 对端网络地址
     string codec = 2;  // 编解码器: json,xml,yaml...
+    TLS tls = 3;  // TLS配置
   }
 
   message Pulsar {
     string endpoint = 1;  // 对端网络地址
     string codec = 2;  // 编解码器: json,xml,yaml...
+    TLS tls = 3;  // TLS配置
   }
 
   message Redis {
     string endpoint = 1;  // 对端网络地址
     string codec = 2;  // 编解码器: json,xml,yaml...
+    TLS tls = 3;  // TLS配置
   }
 
   message RocketMQ {
     string version = 1; // 驱动版本：aliyun、v2、v5
     string codec = 2;  // 编解码器: json,xml,yaml...
+
     bool enable_trace = 3;
 
     repeated string name_servers = 4;
@@ -98,6 +120,8 @@ message Server {
     string namespace = 9;
     string instance_name = 10;
     string group_name = 11;
+
+    TLS tls = 12;  // TLS配置
   }
 
   // Asynq
@@ -106,12 +130,14 @@ message Server {
     string password = 2;  // redis登录密码
     int32 db = 3;  // 数据库索引
     string location = 4; // 时区
+    TLS tls = 5;  // TLS配置
   }
 
   // Machinery
   message Machinery {
     repeated string brokers = 1;  // broker的地址，可以根据实际使用的存储介质，分别指定Redis、AMQP或AWS SQS；
     repeated string backends = 2;  // backend配置，用来指定存放结果的介质的配置。可以根据需求，分别指定为：Redis、memcached或mongodb等；
+    TLS tls = 3;  // TLS配置
   }
 
   // SSE
@@ -120,14 +146,15 @@ message Server {
     string addr = 2;  // 服务监听地址
     string path = 3;  // 路径
     string codec = 4;  // 编解码器
+    TLS tls = 5;  // TLS配置
 
-    google.protobuf.Duration timeout = 5; // 超时时间
-    google.protobuf.Duration event_ttl = 6; // 超时时间
+    google.protobuf.Duration timeout = 10; // 超时时间
+    google.protobuf.Duration event_ttl = 11; //
 
-    bool auto_stream = 7; //
-    bool auto_reply = 8; //
-    bool split_data = 9; //
-    bool encode_base64 = 10; // 进行BASE64编码
+    bool auto_stream = 20; //
+    bool auto_reply = 21; //
+    bool split_data = 22; //
+    bool encode_base64 = 23; // 进行BASE64编码
   }
 
   // SocketIO
@@ -136,6 +163,7 @@ message Server {
     string addr = 2;  // 服务监听地址
     string path = 3;  // 路径
     string codec = 4;  // 编解码器
+    TLS tls = 5;  // TLS配置
   }
 
   // SignalR
@@ -143,9 +171,11 @@ message Server {
     string network = 1; // 网络
     string addr = 2;  // 服务监听地址
     string codec = 3;  // 编解码器
+    TLS tls = 4;  // TLS配置
+
+    google.protobuf.Duration keep_alive_interval = 10; // 超时时间
+    google.protobuf.Duration chan_receive_timeout = 11; // 超时时间
 
-    google.protobuf.Duration keep_alive_interval = 4; // 超时时间
-    google.protobuf.Duration chan_receive_timeout = 5; // 超时时间
     bool debug = 6; // 调试开关
     uint32 stream_buffer_capacity = 7; //
   }
@@ -158,6 +188,7 @@ message Server {
     string codec = 4;  // 编解码器
     google.protobuf.Duration timeout = 5; // 超时时间
     bool strict_slash = 6;
+    TLS tls = 7;  // TLS配置
   }
 
   // Thrift
@@ -168,36 +199,37 @@ message Server {
     bool buffered = 4;
     bool framed = 5;
     bool buffer_size = 6;
+    TLS tls = 7;  // TLS配置
   }
 
   // RPC
 
-  REST rest = 1;  // REST服务
-  GRPC grpc = 2;  // gRPC服务
-  GraphQL graphql = 3;  // GraphQL服务
-  Thrift thrift = 4;  // Thrift服务
+  optional REST rest = 1;  // REST服务
+  optional GRPC grpc = 2;  // gRPC服务
+  optional GraphQL graphql = 3;  // GraphQL服务
+  optional Thrift thrift = 4;  // Thrift服务
 
   // Message Queue
 
-  Mqtt mqtt = 10;  // MQTT服务
-  Kafka kafka = 11;  // Kafka服务
-  RabbitMQ rabbitmq = 12;  // RabbitMQ服务
-  ActiveMQ activemq = 13; // ActiveMQ
-  NATS nats = 14; // NATS
-  NSQ nsq = 15; // NATS
-  Pulsar pulsar = 16; // Pulsar
-  Redis redis = 17; // Redis
-  RocketMQ rocketmq = 18; // RocketMQ
+  optional Mqtt mqtt = 10;  // MQTT服务
+  optional Kafka kafka = 11;  // Kafka服务
+  optional RabbitMQ rabbitmq = 12;  // RabbitMQ服务
+  optional ActiveMQ activemq = 13; // ActiveMQ
+  optional NATS nats = 14; // NATS
+  optional NSQ nsq = 15; // NATS
+  optional Pulsar pulsar = 16; // Pulsar
+  optional Redis redis = 17; // Redis
+  optional RocketMQ rocketmq = 18; // RocketMQ
 
- // RealTime
+  // RealTime
 
-  Websocket websocket = 20;  // Websocket服务
-  SSE sse = 21;  // SSE服务
-  SocketIO socketio = 22;  // SocketIO服务
-  SignalR signalr = 23;  // SignalR服务
+  optional Websocket websocket = 20;  // Websocket服务
+  optional SSE sse = 21;  // SSE服务
+  optional SocketIO socketio = 22;  // SocketIO服务
+  optional SignalR signalr = 23;  // SignalR服务
 
   // Task Queue
 
-  Asynq asynq = 30;  // Asynq服务
-  Machinery machinery = 31;  // Machinery服务
+  optional Asynq asynq = 30;  // Asynq服务
+  optional Machinery machinery = 31;  // Machinery服务
 }

api/protos/conf/v1/kratos_conf_tls.proto

@@ -0,0 +1,23 @@
+syntax = "proto3";
+
+package conf;
+
+option go_package = "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1;conf";
+
+message TLS {
+  message File {
+    optional string cert_path = 1;
+    optional string key_path = 2;
+    optional string ca_path = 3;
+  }
+  message Config {
+    optional bytes cert_pem = 1;
+    optional bytes key_pem = 2;
+    optional bytes ca_pem = 3;
+  }
+
+  optional File file = 1;
+  optional Config config = 2;
+
+  bool insecure_skip_verify = 3;
+}

bootstrap.go

@@ -1,36 +0,0 @@
-package bootstrap
-
-import (
-	"fmt"
-	"github.com/go-kratos/kratos/v2/log"
-	"github.com/go-kratos/kratos/v2/registry"
-
-	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
-)
-
-// Bootstrap 应用引导启动
-func Bootstrap(serviceInfo *ServiceInfo) (*conf.Bootstrap, log.Logger, registry.Registrar) {
-	// inject command flags
-	Flags := NewCommandFlags()
-	Flags.Init()
-
-	var err error
-
-	// load configs
-	if err = LoadBootstrapConfig(Flags.Conf); err != nil {
-		panic(fmt.Sprintf("load config failed: %v", err))
-	}
-
-	// init logger
-	ll := NewLoggerProvider(commonConfig.Logger, serviceInfo)
-
-	// init registrar
-	reg := NewRegistry(commonConfig.Registry)
-
-	// init tracer
-	if err = NewTracerProvider(commonConfig.Trace, serviceInfo); err != nil {
-		panic(fmt.Sprintf("init tracer failed: %v", err))
-	}
-
-	return commonConfig, ll, reg
-}

bootstrap/bootstrap.go

@@ -0,0 +1,94 @@
+package bootstrap
+
+import (
+	"fmt"
+
+	"github.com/go-kratos/kratos/v2"
+	"github.com/go-kratos/kratos/v2/log"
+	kratosRegistry "github.com/go-kratos/kratos/v2/registry"
+	"github.com/go-kratos/kratos/v2/transport"
+
+	"github.com/tx7do/kratos-bootstrap/config"
+	"github.com/tx7do/kratos-bootstrap/logger"
+	"github.com/tx7do/kratos-bootstrap/registry"
+	"github.com/tx7do/kratos-bootstrap/tracer"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+var (
+	Service = config.NewServiceInfo(
+		"",
+		"1.0.0",
+		"",
+	)
+)
+
+// NewApp 创建应用程序
+func NewApp(ll log.Logger, rr kratosRegistry.Registrar, srv ...transport.Server) *kratos.App {
+	return kratos.New(
+		kratos.ID(Service.GetInstanceId()),
+		kratos.Name(Service.Name),
+		kratos.Version(Service.Version),
+		kratos.Metadata(Service.Metadata),
+		kratos.Logger(ll),
+		kratos.Server(
+			srv...,
+		),
+		kratos.Registrar(rr),
+	)
+}
+
+// DoBootstrap 执行引导
+func DoBootstrap(serviceInfo *config.ServiceInfo) (*conf.Bootstrap, log.Logger, kratosRegistry.Registrar) {
+	// inject command flags
+	Flags := config.NewCommandFlags()
+	Flags.Init()
+
+	var err error
+
+	// load configs
+	if err = config.LoadBootstrapConfig(Flags.Conf); err != nil {
+		panic(fmt.Sprintf("load config failed: %v", err))
+	}
+
+	// init logger
+	ll := logger.NewLoggerProvider(config.GetBootstrapConfig().Logger, serviceInfo)
+
+	// init registrar
+	reg := registry.NewRegistry(config.GetBootstrapConfig().Registry)
+
+	// init tracer
+	if err = tracer.NewTracerProvider(config.GetBootstrapConfig().Trace, serviceInfo); err != nil {
+		panic(fmt.Sprintf("init tracer failed: %v", err))
+	}
+
+	return config.GetBootstrapConfig(), ll, reg
+}
+
+type InitApp func(logger log.Logger, registrar kratosRegistry.Registrar, bootstrap *conf.Bootstrap) (*kratos.App, func(), error)
+
+// Bootstrap 应用引导启动
+func Bootstrap(initApp InitApp, serviceName, version *string) {
+	if serviceName != nil && len(*serviceName) != 0 {
+		Service.Name = *serviceName
+	}
+	if version != nil && len(*version) != 0 {
+		Service.Version = *version
+	}
+
+	// bootstrap
+	cfg, ll, reg := DoBootstrap(Service)
+
+	// init app
+	app, cleanup, err := initApp(ll, reg, cfg)
+	if err != nil {
+		panic(err)
+	}
+	defer cleanup()
+
+	// run the app.
+	if err = app.Run(); err != nil {
+		panic(err)
+	}
+}

bootstrap/bootstrap_test.go

@@ -0,0 +1,57 @@
+package bootstrap
+
+import (
+	"testing"
+
+	"github.com/go-kratos/kratos/v2"
+	"github.com/go-kratos/kratos/v2/log"
+	"github.com/go-kratos/kratos/v2/registry"
+
+	v1 "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"github.com/tx7do/kratos-bootstrap/config"
+)
+
+func initApp(logger log.Logger, registrar registry.Registrar, _ *v1.Bootstrap) (*kratos.App, func(), error) {
+	app := NewApp(logger, registrar)
+	return app, func() {
+	}, nil
+}
+
+func TestBootstrap(t *testing.T) {
+	serviceName := "test"
+	version := "v0.0.1"
+	Bootstrap(initApp, &serviceName, &version)
+}
+
+type CustomConfig struct {
+	Cfg string `protobuf:"bytes,1,opt,name=cfg,proto3" json:"cfg,omitempty"`
+}
+
+func initAppEx(logger log.Logger, registrar registry.Registrar, _ *v1.Bootstrap, _ *CustomConfig) (*kratos.App, func(), error) {
+	app := NewApp(logger, registrar)
+	return app, func() {
+	}, nil
+}
+
+func TestCustomBootstrap(t *testing.T) {
+	customCfg := &CustomConfig{}
+	config.RegisterConfig(customCfg)
+
+	Service.SetName("test")
+	Service.SetVersion("v0.0.1")
+
+	// bootstrap
+	cfg, ll, reg := DoBootstrap(Service)
+
+	// init app
+	app, cleanup, err := initAppEx(ll, reg, cfg, customCfg)
+	if err != nil {
+		panic(err)
+	}
+	defer cleanup()
+
+	// run the app.
+	if err = app.Run(); err != nil {
+		panic(err)
+	}
+}

bootstrap/go.mod

@@ -0,0 +1,195 @@
+module github.com/tx7do/kratos-bootstrap/bootstrap
+
+go 1.23
+
+toolchain go1.23.3
+
+replace (
+	github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1
+	github.com/imdario/mergo => dario.cat/mergo v0.3.16
+
+	github.com/tx7do/kratos-bootstrap/api => ../api
+
+	github.com/tx7do/kratos-bootstrap/cache/redis => ../cache/redis
+
+	github.com/tx7do/kratos-bootstrap/config => ../config
+
+	github.com/tx7do/kratos-bootstrap/logger => ../logger
+
+	github.com/tx7do/kratos-bootstrap/oss/minio => ../oss/minio
+
+	github.com/tx7do/kratos-bootstrap/registry => ../registry
+)
+
+require (
+	github.com/go-kratos/kratos/v2 v2.8.2
+	github.com/google/subcommands v1.2.0
+	github.com/olekukonko/tablewriter v0.0.5
+	github.com/spf13/cobra v1.8.1
+	github.com/tx7do/kratos-bootstrap v0.3.14
+	github.com/tx7do/kratos-bootstrap/api v0.0.5
+	golang.org/x/tools v0.27.0
+)
+
+require (
+	dario.cat/mergo v1.0.1 // indirect
+	github.com/aliyun/alibaba-cloud-sdk-go v1.63.51 // indirect
+	github.com/apolloconfig/agollo/v4 v4.4.0 // indirect
+	github.com/armon/go-metrics v0.5.3 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fluent/fluent-logger-golang v1.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-chassis/cari v0.9.0 // indirect
+	github.com/go-chassis/foundation v0.4.0 // indirect
+	github.com/go-chassis/openlog v1.1.3 // indirect
+	github.com/go-chassis/sc-client v0.7.0 // indirect
+	github.com/go-errors/errors v1.5.1 // indirect
+	github.com/go-kratos/aegis v0.2.0 // indirect
+	github.com/go-kratos/kratos/contrib/config/apollo/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/config/etcd/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/config/kubernetes/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/config/nacos/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/log/fluent/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/log/logrus/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/log/tencent/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/log/zap/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/registry/eureka/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/registry/kubernetes/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/registry/nacos/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/registry/servicecomb/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-kratos/kratos/contrib/registry/zookeeper/v2 v2.0.0-20241105072421-f8b97f675b32 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-playground/form/v4 v4.2.1 // indirect
+	github.com/go-zookeeper/zk v1.0.4 // indirect
+	github.com/gofrs/uuid v4.4.0+incompatible // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
+	github.com/hashicorp/consul/api v1.30.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v1.0.2 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hashicorp/serf v0.10.1 // indirect
+	github.com/imdario/mergo v1.0.1 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/karlseguin/ccache/v2 v2.0.8 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/nacos-group/nacos-sdk-go v1.1.5 // indirect
+	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
+	github.com/openzipkin/zipkin-go v0.4.3 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
+	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/sagikazarmark/locafero v0.6.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.19.0 // indirect
+	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
+	go.etcd.io/etcd/client/v3 v3.5.17 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	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/grpc v1.68.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.31.2 // indirect
+	k8s.io/apimachinery v0.31.2 // indirect
+	k8s.io/client-go v0.31.2 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
+)

cache/redis/go.mod

@@ -4,21 +4,23 @@ go 1.22.0
 
 toolchain go1.22.1
 
+replace github.com/tx7do/kratos-bootstrap/api => ../../api
+
 require (
-	github.com/go-kratos/kratos/v2 v2.7.3
-	github.com/redis/go-redis/extra/redisotel/v9 v9.0.5
-	github.com/redis/go-redis/v9 v9.5.1
-	github.com/tx7do/kratos-bootstrap/api v0.0.1
+	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.5
 )
 
 require (
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
-	go.opentelemetry.io/otel v1.16.0 // indirect
-	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/otel/trace v1.16.0 // indirect
-	google.golang.org/protobuf v1.34.0 // indirect
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 )

cache/redis/go.sum

@@ -1,50 +1,45 @@
-github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
-github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/go-kratos/kratos/v2 v2.7.3 h1:T9MS69qk4/HkVUuHw5GS9PDVnOfzn+kxyF0CL5StqxA=
-github.com/go-kratos/kratos/v2 v2.7.3/go.mod h1:CQZ7V0qyVPwrotIpS5VNNUJNzEbcyRUl5pRtxLOIvn4=
+github.com/go-kratos/kratos/v2 v2.8.2 h1:EsEA7AmPQ2YQQ0FZrDWO2HgBNqeWM8z/mWKzS5UkQaQ=
+github.com/go-kratos/kratos/v2 v2.8.2/go.mod h1:+Vfe3FzF0d+BfMdajA11jT0rAyJWublRE/seZQNZVxE=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U=
-github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc=
-github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnAfVjZNvfJTYfPetfZk5yoSTLaQ=
-github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
-github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8=
-github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tx7do/kratos-bootstrap/api v0.0.1 h1:utHlrgYHf5igWIPiv7RFRjiWmnHhVK4CftTFQMo6+pA=
-github.com/tx7do/kratos-bootstrap/api v0.0.1/go.mod h1:Ag3hjntWUFCJP9yQMSMqf5ezCS/pdKrLeYfrsmMkRjw=
-go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
-go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
-go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
-go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
-go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
-go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
-go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
-go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
-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/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
-google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0 h1:BIx9TNZH/Jsr4l1i7VVxnV0JPiwYj8qyrHyuL0fGZrk=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0/go.mod h1:eTg/YQtGYAZD5r3DlGlJptJ45AHA+/G+2NPn30PKzik=
+github.com/redis/go-redis/extra/redisotel/v9 v9.7.0 h1:bQk8xiVFw+3ln4pfELVktpWgYdFpgLLU+quwSoeIof0=
+github.com/redis/go-redis/extra/redisotel/v9 v9.7.0/go.mod h1:0LyN+GHLIJmKtjYRPF7nHyTTMV6E91YngoOopNifQRo=
+github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
+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=
+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=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
+go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
+go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
+go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
+go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
+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.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

config.go

@@ -1,335 +0,0 @@
-package bootstrap
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"google.golang.org/grpc"
-
-	"github.com/go-kratos/kratos/v2/config"
-	"github.com/go-kratos/kratos/v2/log"
-
-	// file
-	fileKratos "github.com/go-kratos/kratos/v2/config/file"
-
-	// etcd
-	etcdKratos "github.com/go-kratos/kratos/contrib/config/etcd/v2"
-	etcdClient "go.etcd.io/etcd/client/v3"
-
-	// nacos
-	nacosKratos "github.com/go-kratos/kratos/contrib/config/nacos/v2"
-	nacosClients "github.com/nacos-group/nacos-sdk-go/clients"
-	nacosConstant "github.com/nacos-group/nacos-sdk-go/common/constant"
-	nacosVo "github.com/nacos-group/nacos-sdk-go/vo"
-
-	// apollo
-	apolloKratos "github.com/go-kratos/kratos/contrib/config/apollo/v2"
-
-	// kubernetes
-	k8sKratos "github.com/go-kratos/kratos/contrib/config/kubernetes/v2"
-	k8sUtil "k8s.io/client-go/util/homedir"
-
-	"github.com/tx7do/kratos-bootstrap/config/consul"
-
-	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
-)
-
-var commonConfig = &conf.Bootstrap{}
-var configList []interface{}
-
-const remoteConfigSourceConfigFile = "remote.yaml"
-
-// RegisterConfig 注册配置
-func RegisterConfig(c interface{}) {
-	initBootstrapConfig()
-	configList = append(configList, c)
-}
-
-func initBootstrapConfig() {
-	if len(configList) > 0 {
-		return
-	}
-
-	configList = append(configList, commonConfig)
-
-	if commonConfig.Server == nil {
-		commonConfig.Server = &conf.Server{}
-		configList = append(configList, commonConfig.Server)
-	}
-
-	if commonConfig.Client == nil {
-		commonConfig.Client = &conf.Client{}
-		configList = append(configList, commonConfig.Client)
-	}
-
-	if commonConfig.Data == nil {
-		commonConfig.Data = &conf.Data{}
-		configList = append(configList, commonConfig.Data)
-	}
-
-	if commonConfig.Trace == nil {
-		commonConfig.Trace = &conf.Tracer{}
-		configList = append(configList, commonConfig.Trace)
-	}
-
-	if commonConfig.Logger == nil {
-		commonConfig.Logger = &conf.Logger{}
-		configList = append(configList, commonConfig.Logger)
-	}
-
-	if commonConfig.Registry == nil {
-		commonConfig.Registry = &conf.Registry{}
-		configList = append(configList, commonConfig.Registry)
-	}
-
-	if commonConfig.Oss == nil {
-		commonConfig.Oss = &conf.OSS{}
-		configList = append(configList, commonConfig.Oss)
-	}
-
-	if commonConfig.Notify == nil {
-		commonConfig.Notify = &conf.Notification{}
-		configList = append(configList, commonConfig.Notify)
-	}
-}
-
-// NewConfigProvider 创建一个配置
-func NewConfigProvider(configPath string) config.Config {
-	err, rc := LoadRemoteConfigSourceConfigs(configPath)
-	if err != nil {
-		log.Error("LoadRemoteConfigSourceConfigs: ", err.Error())
-	}
-	if rc != nil {
-		return config.New(
-			config.WithSource(
-				NewFileConfigSource(configPath),
-				NewRemoteConfigSource(rc),
-			),
-		)
-	} else {
-		return config.New(
-			config.WithSource(
-				NewFileConfigSource(configPath),
-			),
-		)
-	}
-}
-
-// LoadBootstrapConfig 加载程序引导配置
-func LoadBootstrapConfig(configPath string) error {
-	cfg := NewConfigProvider(configPath)
-
-	var err error
-
-	if err = cfg.Load(); err != nil {
-		return err
-	}
-
-	initBootstrapConfig()
-
-	if err = scanConfigs(cfg); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func scanConfigs(cfg config.Config) error {
-	initBootstrapConfig()
-
-	for _, c := range configList {
-		if err := cfg.Scan(c); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func pathExists(path string) bool {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true
-	}
-	if os.IsNotExist(err) {
-		return false
-	}
-	return false
-}
-
-// LoadRemoteConfigSourceConfigs 加载远程配置源的本地配置
-func LoadRemoteConfigSourceConfigs(configPath string) (error, *conf.RemoteConfig) {
-	configPath = configPath + "/" + remoteConfigSourceConfigFile
-	if !pathExists(configPath) {
-		return nil, nil
-	}
-
-	cfg := config.New(
-		config.WithSource(
-			NewFileConfigSource(configPath),
-		),
-	)
-	defer func(cfg config.Config) {
-		if err := cfg.Close(); err != nil {
-			panic(err)
-		}
-	}(cfg)
-
-	var err error
-
-	if err = cfg.Load(); err != nil {
-		return err, nil
-	}
-
-	if err = scanConfigs(cfg); err != nil {
-		return err, nil
-	}
-
-	return nil, commonConfig.Config
-}
-
-type ConfigType string
-
-const (
-	ConfigTypeLocalFile  ConfigType = "file"
-	ConfigTypeNacos      ConfigType = "nacos"
-	ConfigTypeConsul     ConfigType = "consul"
-	ConfigTypeEtcd       ConfigType = "etcd"
-	ConfigTypeApollo     ConfigType = "apollo"
-	ConfigTypeKubernetes ConfigType = "kubernetes"
-	ConfigTypePolaris    ConfigType = "polaris"
-)
-
-// NewRemoteConfigSource 创建一个远程配置源
-func NewRemoteConfigSource(c *conf.RemoteConfig) config.Source {
-	switch ConfigType(c.Type) {
-	default:
-		fallthrough
-	case ConfigTypeLocalFile:
-		return nil
-	case ConfigTypeNacos:
-		return NewNacosConfigSource(c)
-	case ConfigTypeConsul:
-		return consul.NewConfigSource(c)
-	case ConfigTypeEtcd:
-		return NewEtcdConfigSource(c)
-	case ConfigTypeApollo:
-		return NewApolloConfigSource(c)
-	case ConfigTypeKubernetes:
-		return NewKubernetesConfigSource(c)
-	case ConfigTypePolaris:
-		return NewPolarisConfigSource(c)
-	}
-}
-
-// getConfigKey 获取合法的配置名
-func getConfigKey(configKey string, useBackslash bool) string {
-	if useBackslash {
-		return strings.Replace(configKey, `.`, `/`, -1)
-	} else {
-		return configKey
-	}
-}
-
-// NewFileConfigSource 创建一个本地文件配置源
-func NewFileConfigSource(filePath string) config.Source {
-	return fileKratos.NewSource(filePath)
-}
-
-// NewNacosConfigSource 创建一个远程配置源 - Nacos
-func NewNacosConfigSource(c *conf.RemoteConfig) config.Source {
-	srvConf := []nacosConstant.ServerConfig{
-		*nacosConstant.NewServerConfig(c.Nacos.Address, c.Nacos.Port),
-	}
-
-	cliConf := nacosConstant.ClientConfig{
-		TimeoutMs:            10 * 1000, // http请求超时时间，单位毫秒
-		BeatInterval:         5 * 1000,  // 心跳间隔时间，单位毫秒
-		UpdateThreadNum:      20,        // 更新服务的线程数
-		LogLevel:             "debug",
-		CacheDir:             "../../configs/cache", // 缓存目录
-		LogDir:               "../../configs/log",   // 日志目录
-		NotLoadCacheAtStart:  true,                  // 在启动时不读取本地缓存数据，true--不读取，false--读取
-		UpdateCacheWhenEmpty: true,                  // 当服务列表为空时是否更新本地缓存，true--更新,false--不更新
-	}
-
-	nacosClient, err := nacosClients.NewConfigClient(
-		nacosVo.NacosClientParam{
-			ClientConfig:  &cliConf,
-			ServerConfigs: srvConf,
-		},
-	)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return nacosKratos.NewConfigSource(nacosClient,
-		nacosKratos.WithGroup(getConfigKey(c.Nacos.Key, false)),
-		nacosKratos.WithDataID("bootstrap.yaml"),
-	)
-}
-
-// NewEtcdConfigSource 创建一个远程配置源 - Etcd
-func NewEtcdConfigSource(c *conf.RemoteConfig) config.Source {
-	cfg := etcdClient.Config{
-		Endpoints:   c.Etcd.Endpoints,
-		DialTimeout: c.Etcd.Timeout.AsDuration(),
-		DialOptions: []grpc.DialOption{grpc.WithBlock()},
-	}
-
-	cli, err := etcdClient.New(cfg)
-	if err != nil {
-		panic(err)
-	}
-
-	source, err := etcdKratos.New(cli, etcdKratos.WithPath(getConfigKey(c.Etcd.Key, true)))
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return source
-}
-
-// NewApolloConfigSource 创建一个远程配置源 - Apollo
-func NewApolloConfigSource(c *conf.RemoteConfig) config.Source {
-	source := apolloKratos.NewSource(
-		apolloKratos.WithAppID(c.Apollo.AppId),
-		apolloKratos.WithCluster(c.Apollo.Cluster),
-		apolloKratos.WithEndpoint(c.Apollo.Endpoint),
-		apolloKratos.WithNamespace(c.Apollo.Namespace),
-		apolloKratos.WithSecret(c.Apollo.Secret),
-		apolloKratos.WithEnableBackup(),
-	)
-	return source
-}
-
-// NewKubernetesConfigSource 创建一个远程配置源 - Kubernetes
-func NewKubernetesConfigSource(c *conf.RemoteConfig) config.Source {
-	source := k8sKratos.NewSource(
-		k8sKratos.Namespace(c.Kubernetes.Namespace),
-		k8sKratos.LabelSelector(""),
-		k8sKratos.KubeConfig(filepath.Join(k8sUtil.HomeDir(), ".kube", "config")),
-	)
-	return source
-}
-
-// NewPolarisConfigSource 创建一个远程配置源 - Polaris
-func NewPolarisConfigSource(_ *conf.RemoteConfig) config.Source {
-	//configApi, err := polarisApi.NewConfigAPI()
-	//if err != nil {
-	//	log.Fatal(err)
-	//}
-	//
-	//var opts []polarisKratos.Option
-	//opts = append(opts, polarisKratos.WithNamespace("default"))
-	//opts = append(opts, polarisKratos.WithFileGroup("default"))
-	//opts = append(opts, polarisKratos.WithFileName("default.yaml"))
-	//
-	//source, err := polarisKratos.New(configApi, opts...)
-	//if err != nil {
-	//	log.Fatal(err)
-	//}
-	//
-	//return source
-	return nil
-}

config/apollo/client.go

@@ -0,0 +1,23 @@
+package apollo
+
+import (
+	"github.com/go-kratos/kratos/v2/config"
+
+	// apollo
+	apolloKratos "github.com/go-kratos/kratos/contrib/config/apollo/v2"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewConfigSource 创建一个远程配置源 - Apollo
+func NewConfigSource(c *conf.RemoteConfig) config.Source {
+	source := apolloKratos.NewSource(
+		apolloKratos.WithAppID(c.Apollo.AppId),
+		apolloKratos.WithCluster(c.Apollo.Cluster),
+		apolloKratos.WithEndpoint(c.Apollo.Endpoint),
+		apolloKratos.WithNamespace(c.Apollo.Namespace),
+		apolloKratos.WithSecret(c.Apollo.Secret),
+		apolloKratos.WithEnableBackup(),
+	)
+	return source
+}

config/bootstrap_config.go

@@ -0,0 +1,65 @@
+package config
+
+import conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+
+var configList []interface{}
+
+var commonConfig = &conf.Bootstrap{}
+
+func GetBootstrapConfig() *conf.Bootstrap {
+	return commonConfig
+}
+
+// RegisterConfig 注册配置
+func RegisterConfig(c interface{}) {
+	initBootstrapConfig()
+	configList = append(configList, c)
+}
+
+func initBootstrapConfig() {
+	if len(configList) > 0 {
+		return
+	}
+
+	configList = append(configList, commonConfig)
+
+	if commonConfig.Server == nil {
+		commonConfig.Server = &conf.Server{}
+		configList = append(configList, commonConfig.Server)
+	}
+
+	if commonConfig.Client == nil {
+		commonConfig.Client = &conf.Client{}
+		configList = append(configList, commonConfig.Client)
+	}
+
+	if commonConfig.Data == nil {
+		commonConfig.Data = &conf.Data{}
+		configList = append(configList, commonConfig.Data)
+	}
+
+	if commonConfig.Trace == nil {
+		commonConfig.Trace = &conf.Tracer{}
+		configList = append(configList, commonConfig.Trace)
+	}
+
+	if commonConfig.Logger == nil {
+		commonConfig.Logger = &conf.Logger{}
+		configList = append(configList, commonConfig.Logger)
+	}
+
+	if commonConfig.Registry == nil {
+		commonConfig.Registry = &conf.Registry{}
+		configList = append(configList, commonConfig.Registry)
+	}
+
+	if commonConfig.Oss == nil {
+		commonConfig.Oss = &conf.OSS{}
+		configList = append(configList, commonConfig.Oss)
+	}
+
+	if commonConfig.Notify == nil {
+		commonConfig.Notify = &conf.Notification{}
+		configList = append(configList, commonConfig.Notify)
+	}
+}

config/config.go

@@ -0,0 +1,127 @@
+package config
+
+import (
+	"github.com/go-kratos/kratos/v2/config"
+	"github.com/go-kratos/kratos/v2/log"
+
+	fileKratos "github.com/go-kratos/kratos/v2/config/file"
+
+	"github.com/tx7do/kratos-bootstrap/config/apollo"
+	"github.com/tx7do/kratos-bootstrap/config/consul"
+	"github.com/tx7do/kratos-bootstrap/config/etcd"
+	"github.com/tx7do/kratos-bootstrap/config/kubernetes"
+	"github.com/tx7do/kratos-bootstrap/config/nacos"
+	"github.com/tx7do/kratos-bootstrap/config/polaris"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRemoteConfigSource 创建一个远程配置源
+func NewRemoteConfigSource(c *conf.RemoteConfig) config.Source {
+	switch Type(c.Type) {
+	default:
+		fallthrough
+	case LocalFile:
+		return nil
+	case Nacos:
+		return nacos.NewConfigSource(c)
+	case Consul:
+		return consul.NewConfigSource(c)
+	case Etcd:
+		return etcd.NewConfigSource(c)
+	case Apollo:
+		return apollo.NewConfigSource(c)
+	case Kubernetes:
+		return kubernetes.NewConfigSource(c)
+	case Polaris:
+		return polaris.NewConfigSource(c)
+	}
+}
+
+// NewFileConfigSource 创建一个本地文件配置源
+func NewFileConfigSource(filePath string) config.Source {
+	return fileKratos.NewSource(filePath)
+}
+
+// NewConfigProvider 创建一个配置
+func NewConfigProvider(configPath string) config.Config {
+	err, rc := LoadRemoteConfigSourceConfigs(configPath)
+	if err != nil {
+		log.Error("LoadRemoteConfigSourceConfigs: ", err.Error())
+	}
+	if rc != nil {
+		return config.New(
+			config.WithSource(
+				NewFileConfigSource(configPath),
+				NewRemoteConfigSource(rc),
+			),
+		)
+	} else {
+		return config.New(
+			config.WithSource(
+				NewFileConfigSource(configPath),
+			),
+		)
+	}
+}
+
+// LoadBootstrapConfig 加载程序引导配置
+func LoadBootstrapConfig(configPath string) error {
+	cfg := NewConfigProvider(configPath)
+
+	var err error
+
+	if err = cfg.Load(); err != nil {
+		return err
+	}
+
+	initBootstrapConfig()
+
+	if err = scanConfigs(cfg); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func scanConfigs(cfg config.Config) error {
+	initBootstrapConfig()
+
+	for _, c := range configList {
+		if err := cfg.Scan(c); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// LoadRemoteConfigSourceConfigs 加载远程配置源的本地配置
+func LoadRemoteConfigSourceConfigs(configPath string) (error, *conf.RemoteConfig) {
+	configPath = configPath + "/" + remoteConfigSourceConfigFile
+	if !pathExists(configPath) {
+		return nil, nil
+	}
+
+	cfg := config.New(
+		config.WithSource(
+			NewFileConfigSource(configPath),
+		),
+	)
+	defer func(cfg config.Config) {
+		if err := cfg.Close(); err != nil {
+			panic(err)
+		}
+	}(cfg)
+
+	var err error
+
+	if err = cfg.Load(); err != nil {
+		return err, nil
+	}
+
+	if err = scanConfigs(cfg); err != nil {
+		return err, nil
+	}
+
+	return nil, GetBootstrapConfig().Config
+}

config/config_test.go

@@ -1,4 +1,4 @@
-package bootstrap
+package config
 
 import "testing"
 

config/consul/client.go

@@ -0,0 +1,42 @@
+package consul
+
+import (
+	"strings"
+
+	"github.com/go-kratos/kratos/v2/config"
+	"github.com/go-kratos/kratos/v2/log"
+
+	consulApi "github.com/hashicorp/consul/api"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// getConfigKey 获取合法的配置名
+func getConfigKey(configKey string, useBackslash bool) string {
+	if useBackslash {
+		return strings.Replace(configKey, `.`, `/`, -1)
+	} else {
+		return configKey
+	}
+}
+
+// NewConfigSource 创建一个远程配置源 - Consul
+func NewConfigSource(c *conf.RemoteConfig) config.Source {
+	cfg := consulApi.DefaultConfig()
+	cfg.Address = c.Consul.Address
+	cfg.Scheme = c.Consul.Scheme
+
+	cli, err := consulApi.NewClient(cfg)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	src, err := New(cli,
+		WithPath(getConfigKey(c.Consul.Key, true)),
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return src
+}

config/consul/config.go

@@ -1,42 +1,89 @@
 package consul
 
 import (
+	"context"
+	"errors"
+	"path/filepath"
 	"strings"
 
 	"github.com/go-kratos/kratos/v2/config"
-	"github.com/go-kratos/kratos/v2/log"
-
-	consulApi "github.com/hashicorp/consul/api"
-
-	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"github.com/hashicorp/consul/api"
 )
 
-// getConfigKey 获取合法的配置名
-func getConfigKey(configKey string, useBackslash bool) string {
-	if useBackslash {
-		return strings.Replace(configKey, `.`, `/`, -1)
-	} else {
-		return configKey
+// Option is consul config option.
+type Option func(o *options)
+
+type options struct {
+	ctx  context.Context
+	path string
+}
+
+// WithContext with registry context.
+func WithContext(ctx context.Context) Option {
+	return func(o *options) {
+		o.ctx = ctx
 	}
 }
 
-// NewConfigSource 创建一个远程配置源 - Consul
-func NewConfigSource(c *conf.RemoteConfig) config.Source {
-	cfg := consulApi.DefaultConfig()
-	cfg.Address = c.Consul.Address
-	cfg.Scheme = c.Consul.Scheme
-
-	cli, err := consulApi.NewClient(cfg)
-	if err != nil {
-		log.Fatal(err)
+// WithPath is config path
+func WithPath(p string) Option {
+	return func(o *options) {
+		o.path = p
 	}
-
-	src, err := New(cli,
-		WithPath(getConfigKey(c.Consul.Key, true)),
-	)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return src
+}
+
+type source struct {
+	client  *api.Client
+	options *options
+}
+
+func New(client *api.Client, opts ...Option) (config.Source, error) {
+	o := &options{
+		ctx:  context.Background(),
+		path: "",
+	}
+
+	for _, opt := range opts {
+		opt(o)
+	}
+
+	if o.path == "" {
+		return nil, errors.New("path invalid")
+	}
+
+	return &source{
+		client:  client,
+		options: o,
+	}, nil
+}
+
+// Load return the config values
+func (s *source) Load() ([]*config.KeyValue, error) {
+	kv, _, err := s.client.KV().List(s.options.path, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	pathPrefix := s.options.path
+	if !strings.HasSuffix(s.options.path, "/") {
+		pathPrefix = pathPrefix + "/"
+	}
+	kvs := make([]*config.KeyValue, 0)
+	for _, item := range kv {
+		k := strings.TrimPrefix(item.Key, pathPrefix)
+		if k == "" {
+			continue
+		}
+		kvs = append(kvs, &config.KeyValue{
+			Key:    k,
+			Value:  item.Value,
+			Format: strings.TrimPrefix(filepath.Ext(k), "."),
+		})
+	}
+	return kvs, nil
+}
+
+// Watch return the watcher
+func (s *source) Watch() (config.Watcher, error) {
+	return newWatcher(s)
 }

config/consul/go.mod

@@ -1,35 +0,0 @@
-module github.com/tx7do/kratos-bootstrap/config/consul
-
-go 1.22.0
-
-toolchain go1.22.1
-
-replace github.com/tx7do/kratos-bootstrap/api => ../../api
-
-require (
-	github.com/go-kratos/kratos/v2 v2.7.3
-	github.com/hashicorp/consul/api v1.28.2
-	github.com/tx7do/kratos-bootstrap/api v0.0.1
-)
-
-require (
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	google.golang.org/protobuf v1.34.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)

config/consul/go.sum

@@ -1,240 +0,0 @@
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kratos/kratos/v2 v2.7.3 h1:T9MS69qk4/HkVUuHw5GS9PDVnOfzn+kxyF0CL5StqxA=
-github.com/go-kratos/kratos/v2 v2.7.3/go.mod h1:CQZ7V0qyVPwrotIpS5VNNUJNzEbcyRUl5pRtxLOIvn4=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-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=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/hashicorp/consul/api v1.28.2 h1:mXfkRHrpHN4YY3RqL09nXU1eHKLNiuAN4kHvDQ16k/8=
-github.com/hashicorp/consul/api v1.28.2/go.mod h1:KyzqzgMEya+IZPcD65YFoOVAgPpbfERu4I/tzG6/ueE=
-github.com/hashicorp/consul/sdk v0.16.0 h1:SE9m0W6DEfgIVCJX7xU+iv/hUl4m/nxqMTnCdMxDpJ8=
-github.com/hashicorp/consul/sdk v0.16.0/go.mod h1:7pxqqhqoaPqnBnzXD1StKed62LqJeClzVsUEy85Zr0A=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
-github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
-github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
-github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
-github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
-github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
-github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-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/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-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.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=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-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.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
-google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

config/consul/impl.go

@@ -1,89 +0,0 @@
-package consul
-
-import (
-	"context"
-	"errors"
-	"path/filepath"
-	"strings"
-
-	"github.com/go-kratos/kratos/v2/config"
-	"github.com/hashicorp/consul/api"
-)
-
-// Option is consul config option.
-type Option func(o *options)
-
-type options struct {
-	ctx  context.Context
-	path string
-}
-
-// WithContext with registry context.
-func WithContext(ctx context.Context) Option {
-	return func(o *options) {
-		o.ctx = ctx
-	}
-}
-
-// WithPath is config path
-func WithPath(p string) Option {
-	return func(o *options) {
-		o.path = p
-	}
-}
-
-type source struct {
-	client  *api.Client
-	options *options
-}
-
-func New(client *api.Client, opts ...Option) (config.Source, error) {
-	o := &options{
-		ctx:  context.Background(),
-		path: "",
-	}
-
-	for _, opt := range opts {
-		opt(o)
-	}
-
-	if o.path == "" {
-		return nil, errors.New("path invalid")
-	}
-
-	return &source{
-		client:  client,
-		options: o,
-	}, nil
-}
-
-// Load return the config values
-func (s *source) Load() ([]*config.KeyValue, error) {
-	kv, _, err := s.client.KV().List(s.options.path, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	pathPrefix := s.options.path
-	if !strings.HasSuffix(s.options.path, "/") {
-		pathPrefix = pathPrefix + "/"
-	}
-	kvs := make([]*config.KeyValue, 0)
-	for _, item := range kv {
-		k := strings.TrimPrefix(item.Key, pathPrefix)
-		if k == "" {
-			continue
-		}
-		kvs = append(kvs, &config.KeyValue{
-			Key:    k,
-			Value:  item.Value,
-			Format: strings.TrimPrefix(filepath.Ext(k), "."),
-		})
-	}
-	return kvs, nil
-}
-
-// Watch return the watcher
-func (s *source) Watch() (config.Watcher, error) {
-	return newWatcher(s)
-}

config/etcd/client.go

@@ -0,0 +1,45 @@
+package etcd
+
+import (
+	"strings"
+
+	"github.com/go-kratos/kratos/v2/config"
+	"github.com/go-kratos/kratos/v2/log"
+
+	"google.golang.org/grpc"
+
+	etcdKratos "github.com/go-kratos/kratos/contrib/config/etcd/v2"
+	etcdClient "go.etcd.io/etcd/client/v3"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// getConfigKey 获取合法的配置名
+func getConfigKey(configKey string, useBackslash bool) string {
+	if useBackslash {
+		return strings.Replace(configKey, `.`, `/`, -1)
+	} else {
+		return configKey
+	}
+}
+
+// NewConfigSource 创建一个远程配置源 - Etcd
+func NewConfigSource(c *conf.RemoteConfig) config.Source {
+	cfg := etcdClient.Config{
+		Endpoints:   c.Etcd.Endpoints,
+		DialTimeout: c.Etcd.Timeout.AsDuration(),
+		DialOptions: []grpc.DialOption{grpc.WithBlock()},
+	}
+
+	cli, err := etcdClient.New(cfg)
+	if err != nil {
+		panic(err)
+	}
+
+	source, err := etcdKratos.New(cli, etcdKratos.WithPath(getConfigKey(c.Etcd.Key, true)))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return source
+}

config/flag.go

@@ -1,7 +1,12 @@
-package bootstrap
+package config
 
-import "flag"
+import (
+	"flag"
 
+	"github.com/tx7do/kratos-bootstrap/utils"
+)
+
+// CommandFlags 命令传参
 type CommandFlags struct {
 	Conf       string // 引导配置文件路径，默认为：../../configs
 	Env        string // 开发环境：dev、debug……
@@ -11,25 +16,31 @@ type CommandFlags struct {
 }
 
 func NewCommandFlags() *CommandFlags {
-	return &CommandFlags{
+	f := &CommandFlags{
 		Conf:       "",
 		Env:        "",
 		ConfigHost: "",
 		ConfigType: "",
 		Daemon:     false,
 	}
+
+	f.defineFlag()
+
+	return f
 }
 
-func (f *CommandFlags) Init() {
+func (f *CommandFlags) defineFlag() {
 	flag.StringVar(&f.Conf, "conf", "../../configs", "config path, eg: -conf ../../configs")
 	flag.StringVar(&f.Env, "env", "dev", "runtime environment, eg: -env dev")
 	flag.StringVar(&f.ConfigHost, "chost", "127.0.0.1:8500", "config server host, eg: -chost 127.0.0.1:8500")
 	flag.StringVar(&f.ConfigType, "ctype", "consul", "config server host, eg: -ctype consul")
 	flag.BoolVar(&f.Daemon, "d", false, "run app as a daemon with -d=true.")
+}
+
+func (f *CommandFlags) Init() {
+	flag.Parse()
 
 	if f.Daemon {
-		BeDaemon("-d")
+		utils.BeDaemon("-d")
 	}
-
-	flag.Parse()
 }

config/go.mod

@@ -0,0 +1,12 @@
+module github.com/tx7do/kratos-bootstrap/config
+
+go 1.23
+
+toolchain go1.23.2
+
+replace (
+	github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1
+	github.com/imdario/mergo => dario.cat/mergo v0.3.16
+
+	github.com/tx7do/kratos-bootstrap/api => ../api
+)

config/kubernetes/client.go

@@ -0,0 +1,22 @@
+package kubernetes
+
+import (
+	"path/filepath"
+
+	k8sKratos "github.com/go-kratos/kratos/contrib/config/kubernetes/v2"
+	k8sUtil "k8s.io/client-go/util/homedir"
+
+	"github.com/go-kratos/kratos/v2/config"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewConfigSource 创建一个远程配置源 - Kubernetes
+func NewConfigSource(c *conf.RemoteConfig) config.Source {
+	source := k8sKratos.NewSource(
+		k8sKratos.Namespace(c.Kubernetes.Namespace),
+		k8sKratos.LabelSelector(""),
+		k8sKratos.KubeConfig(filepath.Join(k8sUtil.HomeDir(), ".kube", "config")),
+	)
+	return source
+}

config/nacos/client.go

@@ -0,0 +1,57 @@
+package nacos
+
+import (
+	"strings"
+
+	"github.com/go-kratos/kratos/v2/config"
+	"github.com/go-kratos/kratos/v2/log"
+
+	nacosKratos "github.com/go-kratos/kratos/contrib/config/nacos/v2"
+	nacosClients "github.com/nacos-group/nacos-sdk-go/clients"
+	nacosConstant "github.com/nacos-group/nacos-sdk-go/common/constant"
+	nacosVo "github.com/nacos-group/nacos-sdk-go/vo"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// getConfigKey 获取合法的配置名
+func getConfigKey(configKey string, useBackslash bool) string {
+	if useBackslash {
+		return strings.Replace(configKey, `.`, `/`, -1)
+	} else {
+		return configKey
+	}
+}
+
+// NewConfigSource 创建一个远程配置源 - Nacos
+func NewConfigSource(c *conf.RemoteConfig) config.Source {
+	srvConf := []nacosConstant.ServerConfig{
+		*nacosConstant.NewServerConfig(c.Nacos.Address, c.Nacos.Port),
+	}
+
+	cliConf := nacosConstant.ClientConfig{
+		TimeoutMs:            10 * 1000, // http请求超时时间，单位毫秒
+		BeatInterval:         5 * 1000,  // 心跳间隔时间，单位毫秒
+		UpdateThreadNum:      20,        // 更新服务的线程数
+		LogLevel:             "debug",
+		CacheDir:             "../../configs/cache", // 缓存目录
+		LogDir:               "../../configs/log",   // 日志目录
+		NotLoadCacheAtStart:  true,                  // 在启动时不读取本地缓存数据，true--不读取，false--读取
+		UpdateCacheWhenEmpty: true,                  // 当服务列表为空时是否更新本地缓存，true--更新,false--不更新
+	}
+
+	nacosClient, err := nacosClients.NewConfigClient(
+		nacosVo.NacosClientParam{
+			ClientConfig:  &cliConf,
+			ServerConfigs: srvConf,
+		},
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return nacosKratos.NewConfigSource(nacosClient,
+		nacosKratos.WithGroup(getConfigKey(c.Nacos.Key, false)),
+		nacosKratos.WithDataID("bootstrap.yaml"),
+	)
+}

config/options.go

@@ -0,0 +1,15 @@
+package config
+
+const remoteConfigSourceConfigFile = "remote.yaml"
+
+type Type string
+
+const (
+	LocalFile  Type = "file"
+	Nacos      Type = "nacos"
+	Consul     Type = "consul"
+	Etcd       Type = "etcd"
+	Apollo     Type = "apollo"
+	Kubernetes Type = "kubernetes"
+	Polaris    Type = "polaris"
+)

config/polaris/client.go

@@ -0,0 +1,28 @@
+package polaris
+
+import (
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+
+	"github.com/go-kratos/kratos/v2/config"
+)
+
+// NewConfigSource 创建一个远程配置源 - Polaris
+func NewConfigSource(_ *conf.RemoteConfig) config.Source {
+	//configApi, err := polarisApi.NewConfigAPI()
+	//if err != nil {
+	//	log.Fatal(err)
+	//}
+	//
+	//var opts []polarisKratos.Option
+	//opts = append(opts, polarisKratos.WithNamespace("default"))
+	//opts = append(opts, polarisKratos.WithFileGroup("default"))
+	//opts = append(opts, polarisKratos.WithFileName("default.yaml"))
+	//
+	//source, err := polarisKratos.New(configApi, opts...)
+	//if err != nil {
+	//	log.Fatal(err)
+	//}
+	//
+	//return source
+	return nil
+}

config/service_info.go

@@ -1,4 +1,4 @@
-package bootstrap
+package config
 
 import "os"
 
@@ -21,6 +21,14 @@ func NewServiceInfo(name, version, id string) *ServiceInfo {
 	}
 }
 
+func (s *ServiceInfo) SetName(name string) {
+	s.Name = name
+}
+
+func (s *ServiceInfo) SetVersion(version string) {
+	s.Version = version
+}
+
 func (s *ServiceInfo) GetInstanceId() string {
 	return s.Id + "." + s.Name
 }

config/utils.go

@@ -0,0 +1,14 @@
+package config
+
+import "os"
+
+func pathExists(path string) bool {
+	_, err := os.Stat(path)
+	if err == nil {
+		return true
+	}
+	if os.IsNotExist(err) {
+		return false
+	}
+	return false
+}

go.mod

@@ -1,181 +1,5 @@
 module github.com/tx7do/kratos-bootstrap
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.1
-
-replace (
-	github.com/tx7do/kratos-bootstrap/api => ./api
-	github.com/tx7do/kratos-bootstrap/config/consul => ./config/consul
-)
-
-require (
-	github.com/go-chassis/sc-client v0.7.0
-	github.com/go-kratos/aegis v0.2.0
-	github.com/go-kratos/kratos/contrib/config/apollo/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/config/etcd/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/config/kubernetes/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/config/nacos/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/log/aliyun/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/log/fluent/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/log/logrus/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/log/tencent/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/log/zap/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/registry/eureka/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/registry/kubernetes/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/registry/nacos/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/registry/servicecomb/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/contrib/registry/zookeeper/v2 v2.0.0-20240504101732-d0d5761f9ca8
-	github.com/go-kratos/kratos/v2 v2.7.3
-	github.com/go-zookeeper/zk v1.0.3
-	github.com/google/subcommands v1.2.0
-	github.com/gorilla/handlers v1.5.2
-	github.com/hashicorp/consul/api v1.28.2
-	github.com/nacos-group/nacos-sdk-go v1.1.4
-	github.com/olekukonko/tablewriter v0.0.5
-	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.8.0
-	github.com/stretchr/testify v1.9.0
-	github.com/tx7do/kratos-bootstrap/api v0.0.1
-	github.com/tx7do/kratos-bootstrap/config/consul v0.0.1
-	go.etcd.io/etcd/client/v3 v3.5.13
-	go.opentelemetry.io/otel v1.26.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0
-	go.opentelemetry.io/otel/exporters/zipkin v1.26.0
-	go.opentelemetry.io/otel/sdk v1.26.0
-	go.uber.org/zap v1.27.0
-	golang.org/x/tools v0.20.0
-	google.golang.org/grpc v1.63.2
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1
-	k8s.io/client-go v0.30.0
-)
-
-require (
-	github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 // indirect
-	github.com/aliyun/aliyun-log-go-sdk v0.1.72 // indirect
-	github.com/apolloconfig/agollo/v4 v4.3.1 // indirect
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/deckarep/golang-set v1.8.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/fatih/color v1.16.0 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/fluent/fluent-logger-golang v1.9.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-chassis/cari v0.9.0 // indirect
-	github.com/go-chassis/foundation v0.4.0 // indirect
-	github.com/go-chassis/openlog v1.1.3 // indirect
-	github.com/go-errors/errors v1.0.1 // indirect
-	github.com/go-kit/kit v0.10.0 // indirect
-	github.com/go-logfmt/logfmt v0.5.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-playground/form/v4 v4.2.1 // indirect
-	github.com/gofrs/uuid v4.2.0+incompatible // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-hclog v1.6.3 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/golang-lru v1.0.2 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/karlseguin/ccache/v2 v2.0.8 // indirect
-	github.com/klauspost/compress v1.17.6 // indirect
-	github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/openzipkin/zipkin-go v0.4.2 // indirect
-	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
-	github.com/philhofer/fwd v1.1.1 // indirect
-	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
-	github.com/shirou/gopsutil/v3 v3.23.6 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	github.com/spf13/afero v1.9.2 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.11.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.2 // indirect
-	github.com/tinylib/msgp v1.1.6 // indirect
-	github.com/tklauser/go-sysconf v0.3.11 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/yusufpapurcu/wmi v1.2.3 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.13 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
-	go.opentelemetry.io/otel/metric v1.26.0 // indirect
-	go.opentelemetry.io/otel/trace v1.26.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.2.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/oauth2 v0.17.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
-	google.golang.org/protobuf v1.34.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.30.0 // indirect
-	k8s.io/apimachinery v0.30.0 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
-)
+toolchain go1.23.2

grpc.go

@@ -1,109 +0,0 @@
-package bootstrap
-
-import (
-	"context"
-	"time"
-
-	"google.golang.org/grpc"
-
-	"github.com/go-kratos/aegis/ratelimit"
-	"github.com/go-kratos/aegis/ratelimit/bbr"
-
-	"github.com/go-kratos/kratos/v2/log"
-	"github.com/go-kratos/kratos/v2/registry"
-
-	"github.com/go-kratos/kratos/v2/middleware"
-	midRateLimit "github.com/go-kratos/kratos/v2/middleware/ratelimit"
-	"github.com/go-kratos/kratos/v2/middleware/recovery"
-	"github.com/go-kratos/kratos/v2/middleware/tracing"
-	"github.com/go-kratos/kratos/v2/middleware/validate"
-
-	kratosGrpc "github.com/go-kratos/kratos/v2/transport/grpc"
-
-	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
-)
-
-const defaultTimeout = 5 * time.Second
-
-// CreateGrpcClient 创建GRPC客户端
-func CreateGrpcClient(ctx context.Context, r registry.Discovery, serviceName string, cfg *conf.Bootstrap, m ...middleware.Middleware) grpc.ClientConnInterface {
-	endpoint := "discovery:///" + serviceName
-
-	var ms []middleware.Middleware
-	timeout := defaultTimeout
-	if cfg.Client != nil && cfg.Client.Grpc != nil {
-		if cfg.Client.Grpc.Timeout != nil {
-			timeout = cfg.Client.Grpc.Timeout.AsDuration()
-		}
-
-		if cfg.Client.Grpc.Middleware != nil {
-			if cfg.Client.Grpc.Middleware.GetEnableRecovery() {
-				ms = append(ms, recovery.Recovery())
-			}
-			if cfg.Client.Grpc.Middleware.GetEnableTracing() {
-				ms = append(ms, tracing.Client())
-			}
-			if cfg.Client.Grpc.Middleware.GetEnableValidate() {
-				ms = append(ms, validate.Validator())
-			}
-		}
-	}
-	ms = append(ms, m...)
-
-	conn, err := kratosGrpc.DialInsecure(
-		ctx,
-		kratosGrpc.WithEndpoint(endpoint),
-		kratosGrpc.WithDiscovery(r),
-		kratosGrpc.WithTimeout(timeout),
-		kratosGrpc.WithMiddleware(ms...),
-	)
-	if err != nil {
-		log.Fatalf("dial grpc client [%s] failed: %s", serviceName, err.Error())
-	}
-
-	return conn
-}
-
-// CreateGrpcServer 创建GRPC服务端
-func CreateGrpcServer(cfg *conf.Bootstrap, m ...middleware.Middleware) *kratosGrpc.Server {
-	var opts []kratosGrpc.ServerOption
-
-	var ms []middleware.Middleware
-	if cfg.Server != nil && cfg.Server.Grpc != nil && cfg.Server.Grpc.Middleware != nil {
-		if cfg.Server.Grpc.Middleware.GetEnableRecovery() {
-			ms = append(ms, recovery.Recovery())
-		}
-		if cfg.Server.Grpc.Middleware.GetEnableTracing() {
-			ms = append(ms, tracing.Server())
-		}
-		if cfg.Server.Grpc.Middleware.GetEnableValidate() {
-			ms = append(ms, validate.Validator())
-		}
-		if cfg.Server.Grpc.Middleware.GetEnableCircuitBreaker() {
-		}
-		if cfg.Server.Grpc.Middleware.Limiter != nil {
-			var limiter ratelimit.Limiter
-			switch cfg.Server.Grpc.Middleware.Limiter.GetName() {
-			case "bbr":
-				limiter = bbr.NewLimiter()
-			}
-			ms = append(ms, midRateLimit.Server(midRateLimit.WithLimiter(limiter)))
-		}
-	}
-	ms = append(ms, m...)
-	opts = append(opts, kratosGrpc.Middleware(ms...))
-
-	if cfg.Server.Grpc.Network != "" {
-		opts = append(opts, kratosGrpc.Network(cfg.Server.Grpc.Network))
-	}
-	if cfg.Server.Grpc.Addr != "" {
-		opts = append(opts, kratosGrpc.Address(cfg.Server.Grpc.Addr))
-	}
-	if cfg.Server.Grpc.Timeout != nil {
-		opts = append(opts, kratosGrpc.Timeout(cfg.Server.Grpc.Timeout.AsDuration()))
-	}
-
-	srv := kratosGrpc.NewServer(opts...)
-
-	return srv
-}

logger.go

@@ -1,179 +0,0 @@
-package bootstrap
-
-import (
-	"os"
-
-	"github.com/sirupsen/logrus"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"gopkg.in/natefinch/lumberjack.v2"
-
-	aliyunLogger "github.com/go-kratos/kratos/contrib/log/aliyun/v2"
-	fluentLogger "github.com/go-kratos/kratos/contrib/log/fluent/v2"
-	logrusLogger "github.com/go-kratos/kratos/contrib/log/logrus/v2"
-	tencentLogger "github.com/go-kratos/kratos/contrib/log/tencent/v2"
-	zapLogger "github.com/go-kratos/kratos/contrib/log/zap/v2"
-
-	"github.com/go-kratos/kratos/v2/log"
-	"github.com/go-kratos/kratos/v2/middleware/tracing"
-
-	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
-)
-
-type LoggerType string
-
-const (
-	LoggerTypeStd     LoggerType = "std"
-	LoggerTypeFluent  LoggerType = "fluent"
-	LoggerTypeLogrus  LoggerType = "logrus"
-	LoggerTypeZap     LoggerType = "zap"
-	LoggerTypeAliyun  LoggerType = "aliyun"
-	LoggerTypeTencent LoggerType = "tencent"
-)
-
-// NewLoggerProvider 创建一个新的日志记录器提供者
-func NewLoggerProvider(cfg *conf.Logger, serviceInfo *ServiceInfo) log.Logger {
-	l := NewLogger(cfg)
-
-	return log.With(
-		l,
-		"service.id", serviceInfo.Id,
-		"service.name", serviceInfo.Name,
-		"service.version", serviceInfo.Version,
-		"ts", log.DefaultTimestamp,
-		"caller", log.DefaultCaller,
-		"trace_id", tracing.TraceID(),
-		"span_id", tracing.SpanID(),
-	)
-}
-
-// NewLogger 创建一个新的日志记录器
-func NewLogger(cfg *conf.Logger) log.Logger {
-	if cfg == nil {
-		return NewStdLogger()
-	}
-
-	switch LoggerType(cfg.Type) {
-	default:
-		fallthrough
-	case LoggerTypeStd:
-		return NewStdLogger()
-	case LoggerTypeFluent:
-		return NewFluentLogger(cfg)
-	case LoggerTypeZap:
-		return NewZapLogger(cfg)
-	case LoggerTypeLogrus:
-		return NewLogrusLogger(cfg)
-	case LoggerTypeAliyun:
-		return NewAliyunLogger(cfg)
-	case LoggerTypeTencent:
-		return NewTencentLogger(cfg)
-	}
-}
-
-// NewStdLogger 创建一个新的日志记录器 - Kratos内置，控制台输出
-func NewStdLogger() log.Logger {
-	l := log.NewStdLogger(os.Stdout)
-	return l
-}
-
-// NewZapLogger 创建一个新的日志记录器 - Zap
-func NewZapLogger(cfg *conf.Logger) log.Logger {
-	encoderConfig := zap.NewProductionEncoderConfig()
-	encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
-	encoderConfig.TimeKey = "time"
-	encoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
-	encoderConfig.EncodeDuration = zapcore.SecondsDurationEncoder
-	encoderConfig.EncodeCaller = zapcore.ShortCallerEncoder
-	jsonEncoder := zapcore.NewJSONEncoder(encoderConfig)
-
-	lumberJackLogger := &lumberjack.Logger{
-		Filename:   cfg.Zap.Filename,
-		MaxSize:    int(cfg.Zap.MaxSize),
-		MaxBackups: int(cfg.Zap.MaxBackups),
-		MaxAge:     int(cfg.Zap.MaxAge),
-	}
-	writeSyncer := zapcore.AddSync(lumberJackLogger)
-
-	var lvl = new(zapcore.Level)
-	if err := lvl.UnmarshalText([]byte(cfg.Zap.Level)); err != nil {
-		return nil
-	}
-
-	core := zapcore.NewCore(jsonEncoder, writeSyncer, lvl)
-	logger := zap.New(core).WithOptions()
-
-	wrapped := zapLogger.NewLogger(logger)
-
-	return wrapped
-}
-
-// NewLogrusLogger 创建一个新的日志记录器 - Logrus
-func NewLogrusLogger(cfg *conf.Logger) log.Logger {
-	loggerLevel, err := logrus.ParseLevel(cfg.Logrus.Level)
-	if err != nil {
-		loggerLevel = logrus.InfoLevel
-	}
-
-	var loggerFormatter logrus.Formatter
-	switch cfg.Logrus.Formatter {
-	default:
-		fallthrough
-	case "text":
-		loggerFormatter = &logrus.TextFormatter{
-			DisableColors:    cfg.Logrus.DisableColors,
-			DisableTimestamp: cfg.Logrus.DisableTimestamp,
-			TimestampFormat:  cfg.Logrus.TimestampFormat,
-		}
-		break
-	case "json":
-		loggerFormatter = &logrus.JSONFormatter{
-			DisableTimestamp: cfg.Logrus.DisableTimestamp,
-			TimestampFormat:  cfg.Logrus.TimestampFormat,
-		}
-		break
-	}
-
-	logger := logrus.New()
-	logger.Level = loggerLevel
-	logger.Formatter = loggerFormatter
-
-	wrapped := logrusLogger.NewLogger(logger)
-	return wrapped
-}
-
-// NewFluentLogger 创建一个新的日志记录器 - Fluent
-func NewFluentLogger(cfg *conf.Logger) log.Logger {
-	wrapped, err := fluentLogger.NewLogger(cfg.Fluent.Endpoint)
-	if err != nil {
-		panic("create fluent logger failed")
-		return nil
-	}
-	return wrapped
-}
-
-// NewAliyunLogger 创建一个新的日志记录器 - Aliyun
-func NewAliyunLogger(cfg *conf.Logger) log.Logger {
-	wrapped := aliyunLogger.NewAliyunLog(
-		aliyunLogger.WithProject(cfg.Aliyun.Project),
-		aliyunLogger.WithEndpoint(cfg.Aliyun.Endpoint),
-		aliyunLogger.WithAccessKey(cfg.Aliyun.AccessKey),
-		aliyunLogger.WithAccessSecret(cfg.Aliyun.AccessSecret),
-	)
-	return wrapped
-}
-
-// NewTencentLogger 创建一个新的日志记录器 - Tencent
-func NewTencentLogger(cfg *conf.Logger) log.Logger {
-	wrapped, err := tencentLogger.NewLogger(
-		tencentLogger.WithTopicID(cfg.Tencent.TopicId),
-		tencentLogger.WithEndpoint(cfg.Tencent.Endpoint),
-		tencentLogger.WithAccessKey(cfg.Tencent.AccessKey),
-		tencentLogger.WithAccessSecret(cfg.Tencent.AccessSecret),
-	)
-	if err != nil {
-		panic(err)
-		return nil
-	}
-	return wrapped
-}

logger/aliyun/client.go

@@ -0,0 +1,18 @@
+package aliyun
+
+import (
+	aliyunLogger "github.com/go-kratos/kratos/contrib/log/aliyun/v2"
+	"github.com/go-kratos/kratos/v2/log"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewLogger 创建一个新的日志记录器 - Aliyun
+func NewLogger(cfg *conf.Logger) log.Logger {
+	wrapped := aliyunLogger.NewAliyunLog(
+		aliyunLogger.WithProject(cfg.Aliyun.Project),
+		aliyunLogger.WithEndpoint(cfg.Aliyun.Endpoint),
+		aliyunLogger.WithAccessKey(cfg.Aliyun.AccessKey),
+		aliyunLogger.WithAccessSecret(cfg.Aliyun.AccessSecret),
+	)
+	return wrapped
+}

logger/fluent/client.go

@@ -0,0 +1,17 @@
+package fluent
+
+import (
+	fluentLogger "github.com/go-kratos/kratos/contrib/log/fluent/v2"
+	"github.com/go-kratos/kratos/v2/log"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewLogger 创建一个新的日志记录器 - Fluent
+func NewLogger(cfg *conf.Logger) log.Logger {
+	wrapped, err := fluentLogger.NewLogger(cfg.Fluent.Endpoint)
+	if err != nil {
+		panic("create fluent logger failed")
+		return nil
+	}
+	return wrapped
+}

logger/go.mod

@@ -0,0 +1,12 @@
+module github.com/tx7do/kratos-bootstrap/logger
+
+go 1.23
+
+toolchain go1.23.2
+
+replace (
+	github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1
+	github.com/imdario/mergo => dario.cat/mergo v0.3.16
+
+	github.com/tx7do/kratos-bootstrap/api => ../api
+)

logger/logger.go

@@ -0,0 +1,63 @@
+package logger
+
+import (
+	"os"
+
+	"github.com/go-kratos/kratos/v2/log"
+	"github.com/go-kratos/kratos/v2/middleware/tracing"
+
+	"github.com/tx7do/kratos-bootstrap/logger/fluent"
+	"github.com/tx7do/kratos-bootstrap/logger/logrus"
+	"github.com/tx7do/kratos-bootstrap/logger/tencent"
+	"github.com/tx7do/kratos-bootstrap/logger/zap"
+
+	"github.com/tx7do/kratos-bootstrap/config"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewLogger 创建一个新的日志记录器
+func NewLogger(cfg *conf.Logger) log.Logger {
+	if cfg == nil {
+		return NewStdLogger()
+	}
+
+	switch Type(cfg.Type) {
+	default:
+		fallthrough
+	case Std:
+		return NewStdLogger()
+	case Fluent:
+		return fluent.NewLogger(cfg)
+	case Zap:
+		return zap.NewLogger(cfg)
+	case Logrus:
+		return logrus.NewLogger(cfg)
+	case Aliyun:
+		return nil
+	case Tencent:
+		return tencent.NewLogger(cfg)
+	}
+}
+
+// NewLoggerProvider 创建一个新的日志记录器提供者
+func NewLoggerProvider(cfg *conf.Logger, serviceInfo *config.ServiceInfo) log.Logger {
+	l := NewLogger(cfg)
+
+	return log.With(
+		l,
+		"service.id", serviceInfo.Id,
+		"service.name", serviceInfo.Name,
+		"service.version", serviceInfo.Version,
+		"ts", log.DefaultTimestamp,
+		"caller", log.DefaultCaller,
+		"trace_id", tracing.TraceID(),
+		"span_id", tracing.SpanID(),
+	)
+}
+
+// NewStdLogger 创建一个新的日志记录器 - Kratos内置，控制台输出
+func NewStdLogger() log.Logger {
+	l := log.NewStdLogger(os.Stdout)
+	return l
+}

logger/logrus/client.go

@@ -0,0 +1,42 @@
+package logrus
+
+import (
+	logrusLogger "github.com/go-kratos/kratos/contrib/log/logrus/v2"
+	"github.com/go-kratos/kratos/v2/log"
+	"github.com/sirupsen/logrus"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewLogger 创建一个新的日志记录器 - Logrus
+func NewLogger(cfg *conf.Logger) log.Logger {
+	loggerLevel, err := logrus.ParseLevel(cfg.Logrus.Level)
+	if err != nil {
+		loggerLevel = logrus.InfoLevel
+	}
+
+	var loggerFormatter logrus.Formatter
+	switch cfg.Logrus.Formatter {
+	default:
+		fallthrough
+	case "text":
+		loggerFormatter = &logrus.TextFormatter{
+			DisableColors:    cfg.Logrus.DisableColors,
+			DisableTimestamp: cfg.Logrus.DisableTimestamp,
+			TimestampFormat:  cfg.Logrus.TimestampFormat,
+		}
+		break
+	case "json":
+		loggerFormatter = &logrus.JSONFormatter{
+			DisableTimestamp: cfg.Logrus.DisableTimestamp,
+			TimestampFormat:  cfg.Logrus.TimestampFormat,
+		}
+		break
+	}
+
+	logger := logrus.New()
+	logger.Level = loggerLevel
+	logger.Formatter = loggerFormatter
+
+	wrapped := logrusLogger.NewLogger(logger)
+	return wrapped
+}

logger/options.go

@@ -0,0 +1,12 @@
+package logger
+
+type Type string
+
+const (
+	Std     Type = "std"
+	Fluent  Type = "fluent"
+	Logrus  Type = "logrus"
+	Zap     Type = "zap"
+	Aliyun  Type = "aliyun"
+	Tencent Type = "tencent"
+)

logger/tencent/client.go

@@ -0,0 +1,22 @@
+package tencent
+
+import (
+	tencentLogger "github.com/go-kratos/kratos/contrib/log/tencent/v2"
+	"github.com/go-kratos/kratos/v2/log"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewLogger 创建一个新的日志记录器 - Tencent
+func NewLogger(cfg *conf.Logger) log.Logger {
+	wrapped, err := tencentLogger.NewLogger(
+		tencentLogger.WithTopicID(cfg.Tencent.TopicId),
+		tencentLogger.WithEndpoint(cfg.Tencent.Endpoint),
+		tencentLogger.WithAccessKey(cfg.Tencent.AccessKey),
+		tencentLogger.WithAccessSecret(cfg.Tencent.AccessSecret),
+	)
+	if err != nil {
+		panic(err)
+		return nil
+	}
+	return wrapped
+}

logger/zap/client.go

@@ -0,0 +1,44 @@
+package zap
+
+import (
+	zapLogger "github.com/go-kratos/kratos/contrib/log/zap/v2"
+
+	"github.com/go-kratos/kratos/v2/log"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"gopkg.in/natefinch/lumberjack.v2"
+)
+
+// NewLogger 创建一个新的日志记录器 - Zap
+func NewLogger(cfg *conf.Logger) log.Logger {
+	encoderConfig := zap.NewProductionEncoderConfig()
+	encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	encoderConfig.TimeKey = "time"
+	encoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
+	encoderConfig.EncodeDuration = zapcore.SecondsDurationEncoder
+	encoderConfig.EncodeCaller = zapcore.ShortCallerEncoder
+	jsonEncoder := zapcore.NewJSONEncoder(encoderConfig)
+
+	lumberJackLogger := &lumberjack.Logger{
+		Filename:   cfg.Zap.Filename,
+		MaxSize:    int(cfg.Zap.MaxSize),
+		MaxBackups: int(cfg.Zap.MaxBackups),
+		MaxAge:     int(cfg.Zap.MaxAge),
+	}
+	writeSyncer := zapcore.AddSync(lumberJackLogger)
+
+	var lvl = new(zapcore.Level)
+	if err := lvl.UnmarshalText([]byte(cfg.Zap.Level)); err != nil {
+		return nil
+	}
+
+	core := zapcore.NewCore(jsonEncoder, writeSyncer, lvl)
+	logger := zap.New(core).WithOptions()
+
+	wrapped := zapLogger.NewLogger(logger)
+
+	return wrapped
+}

oss/minio/go.mod

@@ -4,25 +4,28 @@ go 1.22.0
 
 toolchain go1.22.1
 
+replace github.com/tx7do/kratos-bootstrap/api => ../../api
+
 require (
-	github.com/go-kratos/kratos/v2 v2.7.3
-	github.com/minio/minio-go/v7 v7.0.70
-	github.com/tx7do/kratos-bootstrap/api v0.0.1
+	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.5
 )
 
 require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/go-ini/ini v1.67.0 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/klauspost/compress v1.17.6 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
-	github.com/rs/xid v1.5.0 // indirect
-	github.com/stretchr/testify v1.8.1 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/protobuf v1.34.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rs/xid v1.6.0 // indirect
+	golang.org/x/crypto v0.29.0 // indirect
+	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 )

oss/minio/go.sum

@@ -1,54 +1,43 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/go-kratos/kratos/v2 v2.7.3 h1:T9MS69qk4/HkVUuHw5GS9PDVnOfzn+kxyF0CL5StqxA=
-github.com/go-kratos/kratos/v2 v2.7.3/go.mod h1:CQZ7V0qyVPwrotIpS5VNNUJNzEbcyRUl5pRtxLOIvn4=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
+github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
+github.com/go-kratos/kratos/v2 v2.8.2 h1:EsEA7AmPQ2YQQ0FZrDWO2HgBNqeWM8z/mWKzS5UkQaQ=
+github.com/go-kratos/kratos/v2 v2.8.2/go.mod h1:+Vfe3FzF0d+BfMdajA11jT0rAyJWublRE/seZQNZVxE=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
-github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
-github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.70 h1:1u9NtMgfK1U42kUxcsl5v0yj6TEOPR497OAQxpJnn2g=
-github.com/minio/minio-go/v7 v7.0.70/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo=
+github.com/minio/minio-go/v7 v7.0.80 h1:2mdUHXEykRdY/BigLt3Iuu1otL0JTogT0Nmltg0wujk=
+github.com/minio/minio-go/v7 v7.0.80/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/tx7do/kratos-bootstrap/api v0.0.1 h1:utHlrgYHf5igWIPiv7RFRjiWmnHhVK4CftTFQMo6+pA=
-github.com/tx7do/kratos-bootstrap/api v0.0.1/go.mod h1:Ag3hjntWUFCJP9yQMSMqf5ezCS/pdKrLeYfrsmMkRjw=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-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.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
-google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+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=
+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=
+golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
+golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

registry.go

@@ -1,288 +0,0 @@
-package bootstrap
-
-import (
-	"path/filepath"
-
-	"github.com/go-kratos/kratos/v2/log"
-	"github.com/go-kratos/kratos/v2/registry"
-
-	// etcd
-	etcdKratos "github.com/go-kratos/kratos/contrib/registry/etcd/v2"
-	etcdClient "go.etcd.io/etcd/client/v3"
-
-	// consul
-	consulKratos "github.com/go-kratos/kratos/contrib/registry/consul/v2"
-	consulClient "github.com/hashicorp/consul/api"
-
-	// eureka
-	eurekaKratos "github.com/go-kratos/kratos/contrib/registry/eureka/v2"
-
-	// nacos
-	nacosKratos "github.com/go-kratos/kratos/contrib/registry/nacos/v2"
-	nacosClients "github.com/nacos-group/nacos-sdk-go/clients"
-	nacosConstant "github.com/nacos-group/nacos-sdk-go/common/constant"
-	nacosVo "github.com/nacos-group/nacos-sdk-go/vo"
-
-	// zookeeper
-	zookeeperKratos "github.com/go-kratos/kratos/contrib/registry/zookeeper/v2"
-	"github.com/go-zookeeper/zk"
-
-	// kubernetes
-	k8sRegistry "github.com/go-kratos/kratos/contrib/registry/kubernetes/v2"
-	k8s "k8s.io/client-go/kubernetes"
-	k8sRest "k8s.io/client-go/rest"
-	k8sTools "k8s.io/client-go/tools/clientcmd"
-	k8sUtil "k8s.io/client-go/util/homedir"
-
-	// polaris
-	//polarisKratos "github.com/go-kratos/kratos/contrib/registry/polaris/v2"
-
-	// servicecomb
-	servicecombClient "github.com/go-chassis/sc-client"
-	servicecombKratos "github.com/go-kratos/kratos/contrib/registry/servicecomb/v2"
-
-	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
-)
-
-type RegistryType string
-
-const (
-	RegistryTypeConsul    RegistryType = "consul"
-	LoggerTypeEtcd        RegistryType = "etcd"
-	LoggerTypeZooKeeper   RegistryType = "zookeeper"
-	LoggerTypeNacos       RegistryType = "nacos"
-	LoggerTypeKubernetes  RegistryType = "kubernetes"
-	LoggerTypeEureka      RegistryType = "eureka"
-	LoggerTypePolaris     RegistryType = "polaris"
-	LoggerTypeServicecomb RegistryType = "servicecomb"
-)
-
-// NewRegistry 创建一个注册客户端
-func NewRegistry(cfg *conf.Registry) registry.Registrar {
-	if cfg == nil {
-		return nil
-	}
-
-	switch RegistryType(cfg.Type) {
-	case RegistryTypeConsul:
-		return NewConsulRegistry(cfg)
-	case LoggerTypeEtcd:
-		return NewEtcdRegistry(cfg)
-	case LoggerTypeZooKeeper:
-		return NewZooKeeperRegistry(cfg)
-	case LoggerTypeNacos:
-		return NewNacosRegistry(cfg)
-	case LoggerTypeKubernetes:
-		return NewKubernetesRegistry(cfg)
-	case LoggerTypeEureka:
-		return NewEurekaRegistry(cfg)
-	case LoggerTypePolaris:
-		return nil
-	case LoggerTypeServicecomb:
-		return NewServicecombRegistry(cfg)
-	}
-
-	return nil
-}
-
-// NewDiscovery 创建一个发现客户端
-func NewDiscovery(cfg *conf.Registry) registry.Discovery {
-	if cfg == nil {
-		return nil
-	}
-
-	switch RegistryType(cfg.Type) {
-	case RegistryTypeConsul:
-		return NewConsulRegistry(cfg)
-	case LoggerTypeEtcd:
-		return NewEtcdRegistry(cfg)
-	case LoggerTypeZooKeeper:
-		return NewZooKeeperRegistry(cfg)
-	case LoggerTypeNacos:
-		return NewNacosRegistry(cfg)
-	case LoggerTypeKubernetes:
-		return NewKubernetesRegistry(cfg)
-	case LoggerTypeEureka:
-		return NewEurekaRegistry(cfg)
-	case LoggerTypePolaris:
-		return nil
-	case LoggerTypeServicecomb:
-		return NewServicecombRegistry(cfg)
-	}
-
-	return nil
-}
-
-// NewConsulRegistry 创建一个注册发现客户端 - Consul
-func NewConsulRegistry(c *conf.Registry) *consulKratos.Registry {
-	cfg := consulClient.DefaultConfig()
-	cfg.Address = c.Consul.Address
-	cfg.Scheme = c.Consul.Scheme
-
-	var cli *consulClient.Client
-	var err error
-	if cli, err = consulClient.NewClient(cfg); err != nil {
-		log.Fatal(err)
-	}
-
-	reg := consulKratos.New(cli, consulKratos.WithHealthCheck(c.Consul.HealthCheck))
-
-	return reg
-}
-
-// NewEtcdRegistry 创建一个注册发现客户端 - Etcd
-func NewEtcdRegistry(c *conf.Registry) *etcdKratos.Registry {
-	cfg := etcdClient.Config{
-		Endpoints: c.Etcd.Endpoints,
-	}
-
-	var err error
-	var cli *etcdClient.Client
-	if cli, err = etcdClient.New(cfg); err != nil {
-		log.Fatal(err)
-	}
-
-	reg := etcdKratos.New(cli)
-
-	return reg
-}
-
-// NewZooKeeperRegistry 创建一个注册发现客户端 - ZooKeeper
-func NewZooKeeperRegistry(c *conf.Registry) *zookeeperKratos.Registry {
-	conn, _, err := zk.Connect(c.Zookeeper.Endpoints, c.Zookeeper.Timeout.AsDuration())
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	reg := zookeeperKratos.New(conn)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return reg
-}
-
-// NewNacosRegistry 创建一个注册发现客户端 - Nacos
-func NewNacosRegistry(c *conf.Registry) *nacosKratos.Registry {
-	srvConf := []nacosConstant.ServerConfig{
-		*nacosConstant.NewServerConfig(c.Nacos.Address, c.Nacos.Port),
-	}
-
-	cliConf := nacosConstant.ClientConfig{
-		NamespaceId:          c.Nacos.NamespaceId,
-		TimeoutMs:            uint64(c.Nacos.Timeout.AsDuration().Milliseconds()), // http请求超时时间，单位毫秒
-		BeatInterval:         c.Nacos.BeatInterval.AsDuration().Milliseconds(),    // 心跳间隔时间，单位毫秒
-		UpdateThreadNum:      int(c.Nacos.UpdateThreadNum),                        // 更新服务的线程数
-		LogLevel:             c.Nacos.LogLevel,
-		CacheDir:             c.Nacos.CacheDir,             // 缓存目录
-		LogDir:               c.Nacos.LogDir,               // 日志目录
-		NotLoadCacheAtStart:  c.Nacos.NotLoadCacheAtStart,  // 在启动时不读取本地缓存数据，true--不读取，false--读取
-		UpdateCacheWhenEmpty: c.Nacos.UpdateCacheWhenEmpty, // 当服务列表为空时是否更新本地缓存，true--更新,false--不更新
-	}
-
-	cli, err := nacosClients.NewNamingClient(
-		nacosVo.NacosClientParam{
-			ClientConfig:  &cliConf,
-			ServerConfigs: srvConf,
-		},
-	)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	reg := nacosKratos.New(cli)
-
-	return reg
-}
-
-// NewKubernetesRegistry 创建一个注册发现客户端 - Kubernetes
-func NewKubernetesRegistry(_ *conf.Registry) *k8sRegistry.Registry {
-	restConfig, err := k8sRest.InClusterConfig()
-	if err != nil {
-		home := k8sUtil.HomeDir()
-		kubeConfig := filepath.Join(home, ".kube", "config")
-		restConfig, err = k8sTools.BuildConfigFromFlags("", kubeConfig)
-		if err != nil {
-			log.Fatal(err)
-			return nil
-		}
-	}
-
-	clientSet, err := k8s.NewForConfig(restConfig)
-	if err != nil {
-		log.Fatal(err)
-		return nil
-	}
-
-	reg := k8sRegistry.NewRegistry(clientSet)
-
-	return reg
-}
-
-// NewEurekaRegistry 创建一个注册发现客户端 - Eureka
-func NewEurekaRegistry(c *conf.Registry) *eurekaKratos.Registry {
-	var opts []eurekaKratos.Option
-	opts = append(opts, eurekaKratos.WithHeartbeat(c.Eureka.HeartbeatInterval.AsDuration()))
-	opts = append(opts, eurekaKratos.WithRefresh(c.Eureka.RefreshInterval.AsDuration()))
-	opts = append(opts, eurekaKratos.WithEurekaPath(c.Eureka.Path))
-
-	var err error
-	var reg *eurekaKratos.Registry
-	if reg, err = eurekaKratos.New(c.Eureka.Endpoints, opts...); err != nil {
-		log.Fatal(err)
-	}
-
-	return reg
-}
-
-// NewPolarisRegistry 创建一个注册发现客户端 - Polaris
-//func NewPolarisRegistry(c *conf.Registry) *polarisKratos.Registry {
-//var err error
-//
-//var consumer polarisApi.ConsumerAPI
-//if consumer, err = polarisApi.NewConsumerAPI(); err != nil {
-//	log.Fatalf("fail to create consumerAPI, err is %v", err)
-//}
-//
-//var provider polarisApi.ProviderAPI
-//provider = polarisApi.NewProviderAPIByContext(consumer.SDKContext())
-//
-//log.Infof("start to register instances, count %d", c.Polaris.InstanceCount)
-//
-//var resp *polarisModel.InstanceRegisterResponse
-//for i := 0; i < (int)(c.Polaris.InstanceCount); i++ {
-//	registerRequest := &polarisApi.InstanceRegisterRequest{}
-//	registerRequest.Service = c.Polaris.Service
-//	registerRequest.Namespace = c.Polaris.Namespace
-//	registerRequest.Host = c.Polaris.Address
-//	registerRequest.Port = (int)(c.Polaris.Port) + i
-//	registerRequest.ServiceToken = c.Polaris.Token
-//	registerRequest.SetHealthy(true)
-//	if resp, err = provider.RegisterInstance(registerRequest); err != nil {
-//		log.Fatalf("fail to register instance %d, err is %v", i, err)
-//	} else {
-//		log.Infof("register instance %d response: instanceId %s", i, resp.InstanceID)
-//	}
-//}
-//
-//reg := polarisKratos.NewRegistry(provider, consumer)
-//
-//return reg
-//}
-
-// NewServicecombRegistry 创建一个注册发现客户端 - Servicecomb
-func NewServicecombRegistry(c *conf.Registry) *servicecombKratos.Registry {
-	cfg := servicecombClient.Options{
-		Endpoints: c.Servicecomb.Endpoints,
-	}
-
-	var cli *servicecombClient.Client
-	var err error
-	if cli, err = servicecombClient.NewClient(cfg); err != nil {
-		log.Fatal(err)
-	}
-
-	reg := servicecombKratos.NewRegistry(cli)
-
-	return reg
-}

registry/consul/client.go

@@ -0,0 +1,27 @@
+package consul
+
+import (
+	"github.com/go-kratos/kratos/v2/log"
+
+	consulKratos "github.com/go-kratos/kratos/contrib/registry/consul/v2"
+	consulClient "github.com/hashicorp/consul/api"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRegistry 创建一个注册发现客户端 - Consul
+func NewRegistry(c *conf.Registry) *consulKratos.Registry {
+	cfg := consulClient.DefaultConfig()
+	cfg.Address = c.Consul.GetAddress()
+	cfg.Scheme = c.Consul.GetScheme()
+
+	var cli *consulClient.Client
+	var err error
+	if cli, err = consulClient.NewClient(cfg); err != nil {
+		log.Fatal(err)
+	}
+
+	reg := consulKratos.New(cli, consulKratos.WithHealthCheck(c.Consul.GetHealthCheck()))
+
+	return reg
+}

registry/consul/client_test.go

@@ -0,0 +1,17 @@
+package consul
+
+import (
+	"github.com/stretchr/testify/assert"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"testing"
+)
+
+func TestNewConsulRegistry(t *testing.T) {
+	var cfg conf.Registry
+	cfg.Consul.Scheme = "http"
+	cfg.Consul.Address = "localhost:8500"
+	cfg.Consul.HealthCheck = false
+
+	reg := NewRegistry(&cfg)
+	assert.Nil(t, reg)
+}

registry/etcd/client.go

@@ -0,0 +1,27 @@
+package etcd
+
+import (
+	"github.com/go-kratos/kratos/v2/log"
+
+	etcdKratos "github.com/go-kratos/kratos/contrib/registry/etcd/v2"
+	etcdClient "go.etcd.io/etcd/client/v3"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRegistry 创建一个注册发现客户端 - Etcd
+func NewRegistry(c *conf.Registry) *etcdKratos.Registry {
+	cfg := etcdClient.Config{
+		Endpoints: c.Etcd.Endpoints,
+	}
+
+	var err error
+	var cli *etcdClient.Client
+	if cli, err = etcdClient.New(cfg); err != nil {
+		log.Fatal(err)
+	}
+
+	reg := etcdKratos.New(cli)
+
+	return reg
+}

registry/etcd/client_test.go

@@ -0,0 +1,15 @@
+package etcd
+
+import (
+	"github.com/stretchr/testify/assert"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"testing"
+)
+
+func TestNewEtcdRegistry(t *testing.T) {
+	var cfg conf.Registry
+	cfg.Etcd.Endpoints = []string{"127.0.0.1:2379"}
+
+	reg := NewRegistry(&cfg)
+	assert.Nil(t, reg)
+}

registry/eureka/client.go

@@ -0,0 +1,25 @@
+package eureka
+
+import (
+	"github.com/go-kratos/kratos/v2/log"
+
+	eurekaKratos "github.com/go-kratos/kratos/contrib/registry/eureka/v2"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRegistry 创建一个注册发现客户端 - Eureka
+func NewRegistry(c *conf.Registry) *eurekaKratos.Registry {
+	var opts []eurekaKratos.Option
+	opts = append(opts, eurekaKratos.WithHeartbeat(c.Eureka.HeartbeatInterval.AsDuration()))
+	opts = append(opts, eurekaKratos.WithRefresh(c.Eureka.RefreshInterval.AsDuration()))
+	opts = append(opts, eurekaKratos.WithEurekaPath(c.Eureka.Path))
+
+	var err error
+	var reg *eurekaKratos.Registry
+	if reg, err = eurekaKratos.New(c.Eureka.Endpoints, opts...); err != nil {
+		log.Fatal(err)
+	}
+
+	return reg
+}

registry/eureka/client_test.go

@@ -0,0 +1,15 @@
+package eureka
+
+import (
+	"github.com/stretchr/testify/assert"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"testing"
+)
+
+func TestNewEurekaRegistry(t *testing.T) {
+	var cfg conf.Registry
+	cfg.Eureka.Endpoints = []string{"https://127.0.0.1:18761"}
+
+	reg := NewRegistry(&cfg)
+	assert.Nil(t, reg)
+}

registry/go.mod

@@ -0,0 +1,129 @@
+module github.com/tx7do/kratos-bootstrap/registry
+
+go 1.23
+
+toolchain go1.23.3
+
+replace (
+	github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1
+	github.com/imdario/mergo => dario.cat/mergo v0.3.16
+
+	github.com/tx7do/kratos-bootstrap/api => ../api
+)
+
+require (
+	github.com/go-chassis/sc-client v0.7.0
+	github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/eureka/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/kubernetes/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/nacos/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/polaris/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/servicecomb/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/zookeeper/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/v2 v2.8.2
+	github.com/go-zookeeper/zk v1.0.4
+	github.com/hashicorp/consul/api v1.30.0
+	github.com/nacos-group/nacos-sdk-go v1.1.5
+	github.com/polarismesh/polaris-go v1.5.8
+	github.com/stretchr/testify v1.9.0
+	github.com/tx7do/kratos-bootstrap/api v0.0.5
+	go.etcd.io/etcd/client/v3 v3.5.17
+	k8s.io/client-go v0.31.2
+)
+
+require (
+	github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 // indirect
+	github.com/armon/go-metrics v0.5.3 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-chassis/cari v0.9.0 // indirect
+	github.com/go-chassis/foundation v0.4.0 // indirect
+	github.com/go-chassis/openlog v1.1.3 // indirect
+	github.com/go-errors/errors v1.0.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gofrs/uuid v4.2.0+incompatible // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v1.0.2 // indirect
+	github.com/hashicorp/serf v0.10.1 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/karlseguin/ccache/v2 v2.0.8 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/polarismesh/specification v1.5.3 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.60.1 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/spf13/pflag v1.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
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
+	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	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-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
+	gopkg.in/ini.v1 v1.42.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.31.2 // indirect
+	k8s.io/apimachinery v0.31.2 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
+)

registry/kubernetes/client.go

@@ -0,0 +1,39 @@
+package kubernetes
+
+import (
+	"path/filepath"
+
+	"github.com/go-kratos/kratos/v2/log"
+
+	k8sRegistry "github.com/go-kratos/kratos/contrib/registry/kubernetes/v2"
+	k8s "k8s.io/client-go/kubernetes"
+	k8sRest "k8s.io/client-go/rest"
+	k8sTools "k8s.io/client-go/tools/clientcmd"
+	k8sUtil "k8s.io/client-go/util/homedir"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRegistry 创建一个注册发现客户端 - Kubernetes
+func NewRegistry(_ *conf.Registry) *k8sRegistry.Registry {
+	restConfig, err := k8sRest.InClusterConfig()
+	if err != nil {
+		home := k8sUtil.HomeDir()
+		kubeConfig := filepath.Join(home, ".kube", "config")
+		restConfig, err = k8sTools.BuildConfigFromFlags("", kubeConfig)
+		if err != nil {
+			log.Fatal(err)
+			return nil
+		}
+	}
+
+	clientSet, err := k8s.NewForConfig(restConfig)
+	if err != nil {
+		log.Fatal(err)
+		return nil
+	}
+
+	reg := k8sRegistry.NewRegistry(clientSet)
+
+	return reg
+}

registry/kubernetes/client_test.go

@@ -0,0 +1,13 @@
+package kubernetes
+
+import (
+	"github.com/stretchr/testify/assert"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"testing"
+)
+
+func TestNewKubernetesRegistry(t *testing.T) {
+	var cfg conf.Registry
+	reg := NewRegistry(&cfg)
+	assert.Nil(t, reg)
+}

registry/nacos/client.go

@@ -0,0 +1,45 @@
+package nacos
+
+import (
+	"github.com/go-kratos/kratos/v2/log"
+
+	nacosKratos "github.com/go-kratos/kratos/contrib/registry/nacos/v2"
+	nacosClients "github.com/nacos-group/nacos-sdk-go/clients"
+	nacosConstant "github.com/nacos-group/nacos-sdk-go/common/constant"
+	nacosVo "github.com/nacos-group/nacos-sdk-go/vo"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRegistry 创建一个注册发现客户端 - Nacos
+func NewRegistry(c *conf.Registry) *nacosKratos.Registry {
+	srvConf := []nacosConstant.ServerConfig{
+		*nacosConstant.NewServerConfig(c.Nacos.Address, c.Nacos.Port),
+	}
+
+	cliConf := nacosConstant.ClientConfig{
+		NamespaceId:          c.Nacos.NamespaceId,
+		TimeoutMs:            uint64(c.Nacos.Timeout.AsDuration().Milliseconds()), // http请求超时时间，单位毫秒
+		BeatInterval:         c.Nacos.BeatInterval.AsDuration().Milliseconds(),    // 心跳间隔时间，单位毫秒
+		UpdateThreadNum:      int(c.Nacos.UpdateThreadNum),                        // 更新服务的线程数
+		LogLevel:             c.Nacos.LogLevel,
+		CacheDir:             c.Nacos.CacheDir,             // 缓存目录
+		LogDir:               c.Nacos.LogDir,               // 日志目录
+		NotLoadCacheAtStart:  c.Nacos.NotLoadCacheAtStart,  // 在启动时不读取本地缓存数据，true--不读取，false--读取
+		UpdateCacheWhenEmpty: c.Nacos.UpdateCacheWhenEmpty, // 当服务列表为空时是否更新本地缓存，true--更新,false--不更新
+	}
+
+	cli, err := nacosClients.NewNamingClient(
+		nacosVo.NacosClientParam{
+			ClientConfig:  &cliConf,
+			ServerConfigs: srvConf,
+		},
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	reg := nacosKratos.New(cli)
+
+	return reg
+}

registry/nacos/client_test.go

@@ -0,0 +1,16 @@
+package nacos
+
+import (
+	"github.com/stretchr/testify/assert"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"testing"
+)
+
+func TestNewNacosRegistry(t *testing.T) {
+	var cfg conf.Registry
+	cfg.Nacos.Address = "127.0.0.1"
+	cfg.Nacos.Port = 8848
+
+	reg := NewRegistry(&cfg)
+	assert.Nil(t, reg)
+}

registry/options.go

@@ -0,0 +1,14 @@
+package registry
+
+type Type string
+
+const (
+	Consul      Type = "consul"
+	Etcd        Type = "etcd"
+	ZooKeeper   Type = "zookeeper"
+	Nacos       Type = "nacos"
+	Kubernetes  Type = "kubernetes"
+	Eureka      Type = "eureka"
+	Polaris     Type = "polaris"
+	Servicecomb Type = "servicecomb"
+)

registry/polaris/client.go

@@ -0,0 +1,47 @@
+package polaris
+
+import (
+	"github.com/go-kratos/kratos/v2/log"
+
+	polarisKratos "github.com/go-kratos/kratos/contrib/registry/polaris/v2"
+
+	polarisApi "github.com/polarismesh/polaris-go"
+	polarisModel "github.com/polarismesh/polaris-go/pkg/model"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewPolarisRegistry 创建一个注册发现客户端 - Polaris
+func NewPolarisRegistry(c *conf.Registry) *polarisKratos.Registry {
+	var err error
+
+	var consumer polarisApi.ConsumerAPI
+	if consumer, err = polarisApi.NewConsumerAPI(); err != nil {
+		log.Fatalf("fail to create consumerAPI, err is %v", err)
+	}
+
+	var provider polarisApi.ProviderAPI
+	provider = polarisApi.NewProviderAPIByContext(consumer.SDKContext())
+
+	log.Infof("start to register instances, count %d", c.Polaris.InstanceCount)
+
+	var resp *polarisModel.InstanceRegisterResponse
+	for i := 0; i < (int)(c.Polaris.InstanceCount); i++ {
+		registerRequest := &polarisApi.InstanceRegisterRequest{}
+		registerRequest.Service = c.Polaris.Service
+		registerRequest.Namespace = c.Polaris.Namespace
+		registerRequest.Host = c.Polaris.Address
+		registerRequest.Port = (int)(c.Polaris.Port) + i
+		registerRequest.ServiceToken = c.Polaris.Token
+		registerRequest.SetHealthy(true)
+		if resp, err = provider.RegisterInstance(registerRequest); err != nil {
+			log.Fatalf("fail to register instance %d, err is %v", i, err)
+		} else {
+			log.Infof("register instance %d response: instanceId %s", i, resp.InstanceID)
+		}
+	}
+
+	reg := polarisKratos.NewRegistry(provider, consumer)
+
+	return reg
+}

registry/polaris/client_test.go

@@ -0,0 +1,20 @@
+package polaris
+
+import (
+	"github.com/stretchr/testify/assert"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"testing"
+)
+
+func TestNewPolarisRegistry(t *testing.T) {
+	var cfg conf.Registry
+	cfg.Polaris.Address = "127.0.0.1"
+	cfg.Polaris.Port = 8091
+	cfg.Polaris.InstanceCount = 5
+	cfg.Polaris.Namespace = "default"
+	cfg.Polaris.Service = "DiscoverEchoServer"
+	cfg.Polaris.Token = ""
+
+	reg := NewPolarisRegistry(&cfg)
+	assert.Nil(t, reg)
+}

registry/registry.go

@@ -0,0 +1,71 @@
+package registry
+
+import (
+	"github.com/go-kratos/kratos/v2/registry"
+
+	"github.com/tx7do/kratos-bootstrap/registry/consul"
+	"github.com/tx7do/kratos-bootstrap/registry/etcd"
+	"github.com/tx7do/kratos-bootstrap/registry/eureka"
+	"github.com/tx7do/kratos-bootstrap/registry/kubernetes"
+	"github.com/tx7do/kratos-bootstrap/registry/nacos"
+	"github.com/tx7do/kratos-bootstrap/registry/servicecomb"
+	"github.com/tx7do/kratos-bootstrap/registry/zookeeper"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRegistry 创建一个注册客户端
+func NewRegistry(cfg *conf.Registry) registry.Registrar {
+	if cfg == nil {
+		return nil
+	}
+
+	switch Type(cfg.Type) {
+	case Consul:
+		return consul.NewRegistry(cfg)
+	case Etcd:
+		return etcd.NewRegistry(cfg)
+	case ZooKeeper:
+		return zookeeper.NewRegistry(cfg)
+	case Nacos:
+		return nacos.NewRegistry(cfg)
+	case Kubernetes:
+		return kubernetes.NewRegistry(cfg)
+	case Eureka:
+		return eureka.NewRegistry(cfg)
+	case Polaris:
+		return nil
+	case Servicecomb:
+		return servicecomb.NewRegistry(cfg)
+	}
+
+	return nil
+}
+
+// NewDiscovery 创建一个发现客户端
+func NewDiscovery(cfg *conf.Registry) registry.Discovery {
+	if cfg == nil {
+		return nil
+	}
+
+	switch Type(cfg.Type) {
+	case Consul:
+		return consul.NewRegistry(cfg)
+	case Etcd:
+		return etcd.NewRegistry(cfg)
+	case ZooKeeper:
+		return zookeeper.NewRegistry(cfg)
+	case Nacos:
+		return nacos.NewRegistry(cfg)
+	case Kubernetes:
+		return kubernetes.NewRegistry(cfg)
+	case Eureka:
+		return eureka.NewRegistry(cfg)
+	case Polaris:
+		return nil
+	case Servicecomb:
+		return servicecomb.NewRegistry(cfg)
+	}
+
+	return nil
+}

registry/registry_test.go

@@ -0,0 +1 @@
+package registry

registry/servicecomb/client.go

@@ -0,0 +1,27 @@
+package servicecomb
+
+import (
+	"github.com/go-kratos/kratos/v2/log"
+
+	servicecombClient "github.com/go-chassis/sc-client"
+	servicecombKratos "github.com/go-kratos/kratos/contrib/registry/servicecomb/v2"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRegistry 创建一个注册发现客户端 - Servicecomb
+func NewRegistry(c *conf.Registry) *servicecombKratos.Registry {
+	cfg := servicecombClient.Options{
+		Endpoints: c.Servicecomb.Endpoints,
+	}
+
+	var cli *servicecombClient.Client
+	var err error
+	if cli, err = servicecombClient.NewClient(cfg); err != nil {
+		log.Fatal(err)
+	}
+
+	reg := servicecombKratos.NewRegistry(cli)
+
+	return reg
+}

registry/servicecomb/client_test.go

@@ -0,0 +1,15 @@
+package servicecomb
+
+import (
+	"github.com/stretchr/testify/assert"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"testing"
+)
+
+func TestNewServicecombRegistry(t *testing.T) {
+	var cfg conf.Registry
+	cfg.Servicecomb.Endpoints = []string{"127.0.0.1:30100"}
+
+	reg := NewRegistry(&cfg)
+	assert.Nil(t, reg)
+}

registry/zookeeper/client.go

@@ -0,0 +1,25 @@
+package zookeeper
+
+import (
+	"github.com/go-kratos/kratos/v2/log"
+
+	zookeeperKratos "github.com/go-kratos/kratos/contrib/registry/zookeeper/v2"
+	"github.com/go-zookeeper/zk"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+)
+
+// NewRegistry 创建一个注册发现客户端 - ZooKeeper
+func NewRegistry(c *conf.Registry) *zookeeperKratos.Registry {
+	conn, _, err := zk.Connect(c.Zookeeper.Endpoints, c.Zookeeper.Timeout.AsDuration())
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	reg := zookeeperKratos.New(conn)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return reg
+}

registry/zookeeper/client_test.go

@@ -0,0 +1,15 @@
+package zookeeper
+
+import (
+	"github.com/stretchr/testify/assert"
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"testing"
+)
+
+func TestNewZooKeeperRegistry(t *testing.T) {
+	var cfg conf.Registry
+	cfg.Zookeeper.Endpoints = []string{"127.0.0.1:2181"}
+
+	reg := NewRegistry(&cfg)
+	assert.Nil(t, reg)
+}

registry_test.go

@@ -1,79 +0,0 @@
-package bootstrap
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
-)
-
-func TestNewConsulRegistry(t *testing.T) {
-	var cfg conf.Registry
-	cfg.Consul.Scheme = "http"
-	cfg.Consul.Address = "localhost:8500"
-	cfg.Consul.HealthCheck = false
-
-	reg := NewConsulRegistry(&cfg)
-	assert.Nil(t, reg)
-}
-
-func TestNewEtcdRegistry(t *testing.T) {
-	var cfg conf.Registry
-	cfg.Etcd.Endpoints = []string{"127.0.0.1:2379"}
-
-	reg := NewEtcdRegistry(&cfg)
-	assert.Nil(t, reg)
-}
-
-func TestNewNacosRegistry(t *testing.T) {
-	var cfg conf.Registry
-	cfg.Nacos.Address = "127.0.0.1"
-	cfg.Nacos.Port = 8848
-
-	reg := NewNacosRegistry(&cfg)
-	assert.Nil(t, reg)
-}
-
-func TestNewZooKeeperRegistry(t *testing.T) {
-	var cfg conf.Registry
-	cfg.Zookeeper.Endpoints = []string{"127.0.0.1:2181"}
-
-	reg := NewZooKeeperRegistry(&cfg)
-	assert.Nil(t, reg)
-}
-
-func TestNewKubernetesRegistry(t *testing.T) {
-	var cfg conf.Registry
-	reg := NewKubernetesRegistry(&cfg)
-	assert.Nil(t, reg)
-}
-
-func TestNewEurekaRegistry(t *testing.T) {
-	var cfg conf.Registry
-	cfg.Eureka.Endpoints = []string{"https://127.0.0.1:18761"}
-
-	reg := NewEurekaRegistry(&cfg)
-	assert.Nil(t, reg)
-}
-
-func TestNewPolarisRegistry(t *testing.T) {
-	//var cfg conf.Registry
-	//cfg.Polaris.Address = "127.0.0.1"
-	//cfg.Polaris.Port = 8091
-	//cfg.Polaris.InstanceCount = 5
-	//cfg.Polaris.Namespace = "default"
-	//cfg.Polaris.Service = "DiscoverEchoServer"
-	//cfg.Polaris.Token = ""
-	//
-	//reg := NewPolarisRegistry(&cfg)
-	//assert.Nil(t, reg)
-}
-
-func TestNewServicecombRegistry(t *testing.T) {
-	var cfg conf.Registry
-	cfg.Servicecomb.Endpoints = []string{"127.0.0.1:30100"}
-
-	reg := NewServicecombRegistry(&cfg)
-	assert.Nil(t, reg)
-}

rpc/go.mod

@@ -0,0 +1,129 @@
+module github.com/tx7do/kratos-bootstrap/rpc
+
+go 1.23
+
+toolchain go1.23.3
+
+replace (
+	github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1
+	github.com/imdario/mergo => dario.cat/mergo v0.3.16
+
+	github.com/tx7do/kratos-bootstrap/api => ../api
+)
+
+require (
+	github.com/go-chassis/sc-client v0.7.0
+	github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/eureka/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/kubernetes/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/nacos/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/polaris/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/servicecomb/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/zookeeper/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/v2 v2.8.2
+	github.com/go-zookeeper/zk v1.0.4
+	github.com/hashicorp/consul/api v1.30.0
+	github.com/nacos-group/nacos-sdk-go v1.1.5
+	github.com/polarismesh/polaris-go v1.5.8
+	github.com/stretchr/testify v1.9.0
+	github.com/tx7do/kratos-bootstrap/api v0.0.5
+	go.etcd.io/etcd/client/v3 v3.5.17
+	k8s.io/client-go v0.31.2
+)
+
+require (
+	github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 // indirect
+	github.com/armon/go-metrics v0.5.3 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-chassis/cari v0.9.0 // indirect
+	github.com/go-chassis/foundation v0.4.0 // indirect
+	github.com/go-chassis/openlog v1.1.3 // indirect
+	github.com/go-errors/errors v1.0.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gofrs/uuid v4.2.0+incompatible // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v1.0.2 // indirect
+	github.com/hashicorp/serf v0.10.1 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/karlseguin/ccache/v2 v2.0.8 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/polarismesh/specification v1.5.3 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.60.1 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/spf13/pflag v1.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
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
+	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	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-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
+	gopkg.in/ini.v1 v1.42.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.31.2 // indirect
+	k8s.io/apimachinery v0.31.2 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
+)

rpc/grpc.go

@@ -0,0 +1,199 @@
+package rpc
+
+import (
+	"context"
+	"crypto/tls"
+	"strings"
+	"time"
+
+	"github.com/go-kratos/aegis/ratelimit"
+	"github.com/go-kratos/aegis/ratelimit/bbr"
+
+	"google.golang.org/grpc"
+
+	"github.com/go-kratos/kratos/v2/log"
+	"github.com/go-kratos/kratos/v2/registry"
+
+	"github.com/go-kratos/kratos/v2/middleware"
+	midRateLimit "github.com/go-kratos/kratos/v2/middleware/ratelimit"
+	"github.com/go-kratos/kratos/v2/middleware/recovery"
+	"github.com/go-kratos/kratos/v2/middleware/tracing"
+	"github.com/go-kratos/kratos/v2/middleware/validate"
+
+	kratosGrpc "github.com/go-kratos/kratos/v2/transport/grpc"
+
+	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"github.com/tx7do/kratos-bootstrap/utils"
+)
+
+const defaultTimeout = 5 * time.Second
+
+// CreateGrpcClient 创建GRPC客户端
+func CreateGrpcClient(ctx context.Context, r registry.Discovery, serviceName string, cfg *conf.Bootstrap, mds ...middleware.Middleware) grpc.ClientConnInterface {
+
+	var options []kratosGrpc.ClientOption
+
+	options = append(options, kratosGrpc.WithDiscovery(r))
+
+	var endpoint string
+	if strings.HasPrefix(serviceName, "discovery:///") {
+		endpoint = serviceName
+	} else {
+		endpoint = "discovery:///" + serviceName
+	}
+	options = append(options, kratosGrpc.WithEndpoint(endpoint))
+
+	options = append(options, initGrpcClientConfig(cfg, mds...)...)
+
+	conn, err := kratosGrpc.DialInsecure(ctx, options...)
+	if err != nil {
+		log.Fatalf("dial grpc client [%s] failed: %s", serviceName, err.Error())
+	}
+
+	return conn
+}
+
+func initGrpcClientConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []kratosGrpc.ClientOption {
+	if cfg.Client == nil || cfg.Client.Grpc == nil {
+		return nil
+	}
+
+	var options []kratosGrpc.ClientOption
+
+	timeout := defaultTimeout
+	if cfg.Client.Grpc.Timeout != nil {
+		timeout = cfg.Client.Grpc.Timeout.AsDuration()
+	}
+	options = append(options, kratosGrpc.WithTimeout(timeout))
+
+	var ms []middleware.Middleware
+	ms = append(ms, mds...)
+	if cfg.Client.Grpc.Middleware != nil {
+		if cfg.Client.Grpc.Middleware.GetEnableRecovery() {
+			ms = append(ms, recovery.Recovery())
+		}
+		if cfg.Client.Grpc.Middleware.GetEnableTracing() {
+			ms = append(ms, tracing.Client())
+		}
+		if cfg.Client.Grpc.Middleware.GetEnableValidate() {
+			ms = append(ms, validate.Validator())
+		}
+	}
+	options = append(options, kratosGrpc.WithMiddleware(ms...))
+
+	if cfg.Client.Grpc.Tls != nil {
+		var tlsCfg *tls.Config
+		var err error
+
+		if cfg.Client.Grpc.Tls.File != nil {
+			if tlsCfg, err = utils.LoadClientTlsConfigFile(
+				cfg.Client.Grpc.Tls.File.GetKeyPath(),
+				cfg.Client.Grpc.Tls.File.GetCertPath(),
+				cfg.Client.Grpc.Tls.File.GetCaPath(),
+			); err != nil {
+				panic(err)
+			}
+		}
+		if tlsCfg == nil && cfg.Client.Grpc.Tls.Config != nil {
+			if tlsCfg, err = utils.LoadClientTlsConfig(
+				cfg.Client.Grpc.Tls.Config.GetKeyPem(),
+				cfg.Client.Grpc.Tls.Config.GetCertPem(),
+				cfg.Client.Grpc.Tls.Config.GetCaPem(),
+			); err != nil {
+				panic(err)
+			}
+		}
+
+		if tlsCfg != nil {
+			options = append(options, kratosGrpc.WithTLSConfig(tlsCfg))
+		}
+	}
+
+	return options
+}
+
+// CreateGrpcServer 创建GRPC服务端
+func CreateGrpcServer(cfg *conf.Bootstrap, mds ...middleware.Middleware) *kratosGrpc.Server {
+	var options []kratosGrpc.ServerOption
+
+	options = append(options, initGrpcServerConfig(cfg, mds...)...)
+
+	srv := kratosGrpc.NewServer(options...)
+
+	return srv
+}
+
+func initGrpcServerConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []kratosGrpc.ServerOption {
+	if cfg.Server == nil || cfg.Server.Grpc == nil {
+		return nil
+	}
+
+	var options []kratosGrpc.ServerOption
+
+	var ms []middleware.Middleware
+	ms = append(ms, mds...)
+	if cfg.Server.Grpc.Middleware != nil {
+		if cfg.Server.Grpc.Middleware.GetEnableRecovery() {
+			ms = append(ms, recovery.Recovery())
+		}
+		if cfg.Server.Grpc.Middleware.GetEnableTracing() {
+			ms = append(ms, tracing.Server())
+		}
+		if cfg.Server.Grpc.Middleware.GetEnableValidate() {
+			ms = append(ms, validate.Validator())
+		}
+		if cfg.Server.Grpc.Middleware.GetEnableCircuitBreaker() {
+		}
+		if cfg.Server.Grpc.Middleware.Limiter != nil {
+			var limiter ratelimit.Limiter
+			switch cfg.Server.Grpc.Middleware.Limiter.GetName() {
+			case "bbr":
+				limiter = bbr.NewLimiter()
+			}
+			ms = append(ms, midRateLimit.Server(midRateLimit.WithLimiter(limiter)))
+		}
+	}
+	options = append(options, kratosGrpc.Middleware(ms...))
+
+	if cfg.Server.Grpc.Tls != nil {
+		var tlsCfg *tls.Config
+		var err error
+
+		if cfg.Server.Grpc.Tls.File != nil {
+			if tlsCfg, err = utils.LoadServerTlsConfigFile(
+				cfg.Server.Grpc.Tls.File.GetKeyPath(),
+				cfg.Server.Grpc.Tls.File.GetCertPath(),
+				cfg.Server.Grpc.Tls.File.GetCaPath(),
+				cfg.Server.Grpc.Tls.InsecureSkipVerify,
+			); err != nil {
+				panic(err)
+			}
+		}
+		if tlsCfg == nil && cfg.Server.Grpc.Tls.Config != nil {
+			if tlsCfg, err = utils.LoadServerTlsConfig(
+				cfg.Server.Grpc.Tls.Config.GetKeyPem(),
+				cfg.Server.Grpc.Tls.Config.GetCertPem(),
+				cfg.Server.Grpc.Tls.Config.GetCaPem(),
+				cfg.Server.Grpc.Tls.InsecureSkipVerify,
+			); err != nil {
+				panic(err)
+			}
+		}
+
+		if tlsCfg != nil {
+			options = append(options, kratosGrpc.TLSConfig(tlsCfg))
+		}
+	}
+
+	if cfg.Server.Grpc.Network != "" {
+		options = append(options, kratosGrpc.Network(cfg.Server.Grpc.Network))
+	}
+	if cfg.Server.Grpc.Addr != "" {
+		options = append(options, kratosGrpc.Address(cfg.Server.Grpc.Addr))
+	}
+	if cfg.Server.Grpc.Timeout != nil {
+		options = append(options, kratosGrpc.Timeout(cfg.Server.Grpc.Timeout.AsDuration()))
+	}
+
+	return options
+}

rpc/rest.go

@@ -1,8 +1,11 @@
-package bootstrap
+package rpc
 
 import (
+	"crypto/tls"
 	"net/http/pprof"
 
+	"github.com/gorilla/handlers"
+
 	"github.com/go-kratos/aegis/ratelimit"
 	"github.com/go-kratos/aegis/ratelimit/bbr"
 
@@ -14,23 +17,43 @@ import (
 
 	kratosRest "github.com/go-kratos/kratos/v2/transport/http"
 
-	"github.com/gorilla/handlers"
-
 	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"github.com/tx7do/kratos-bootstrap/utils"
 )
 
 // CreateRestServer 创建REST服务端
-func CreateRestServer(cfg *conf.Bootstrap, m ...middleware.Middleware) *kratosRest.Server {
-	var opts = []kratosRest.ServerOption{
-		kratosRest.Filter(handlers.CORS(
+func CreateRestServer(cfg *conf.Bootstrap, mds ...middleware.Middleware) *kratosRest.Server {
+	var options []kratosRest.ServerOption
+
+	options = append(options, initRestConfig(cfg, mds...)...)
+
+	srv := kratosRest.NewServer(options...)
+
+	if cfg.Server != nil && cfg.Server.Rest != nil && cfg.Server.Rest.GetEnablePprof() {
+		registerHttpPprof(srv)
+	}
+
+	return srv
+}
+
+func initRestConfig(cfg *conf.Bootstrap, mds ...middleware.Middleware) []kratosRest.ServerOption {
+	if cfg.Server == nil || cfg.Server.Rest == nil {
+		return nil
+	}
+
+	var options []kratosRest.ServerOption
+
+	if cfg.Server.Rest.Cors != nil {
+		options = append(options, kratosRest.Filter(handlers.CORS(
 			handlers.AllowedHeaders(cfg.Server.Rest.Cors.Headers),
 			handlers.AllowedMethods(cfg.Server.Rest.Cors.Methods),
 			handlers.AllowedOrigins(cfg.Server.Rest.Cors.Origins),
-		)),
+		)))
 	}
 
 	var ms []middleware.Middleware
-	if cfg.Server != nil && cfg.Server.Rest != nil && cfg.Server.Rest.Middleware != nil {
+	ms = append(ms, mds...)
+	if cfg.Server.Rest.Middleware != nil {
 		if cfg.Server.Rest.Middleware.GetEnableRecovery() {
 			ms = append(ms, recovery.Recovery())
 		}
@@ -51,26 +74,49 @@ func CreateRestServer(cfg *conf.Bootstrap, m ...middleware.Middleware) *kratosRe
 			ms = append(ms, midRateLimit.Server(midRateLimit.WithLimiter(limiter)))
 		}
 	}
-	ms = append(ms, m...)
-	opts = append(opts, kratosRest.Middleware(ms...))
+	options = append(options, kratosRest.Middleware(ms...))
 
 	if cfg.Server.Rest.Network != "" {
-		opts = append(opts, kratosRest.Network(cfg.Server.Rest.Network))
+		options = append(options, kratosRest.Network(cfg.Server.Rest.Network))
 	}
 	if cfg.Server.Rest.Addr != "" {
-		opts = append(opts, kratosRest.Address(cfg.Server.Rest.Addr))
+		options = append(options, kratosRest.Address(cfg.Server.Rest.Addr))
 	}
 	if cfg.Server.Rest.Timeout != nil {
-		opts = append(opts, kratosRest.Timeout(cfg.Server.Rest.Timeout.AsDuration()))
+		options = append(options, kratosRest.Timeout(cfg.Server.Rest.Timeout.AsDuration()))
 	}
 
-	srv := kratosRest.NewServer(opts...)
+	if cfg.Server.Rest.Tls != nil {
+		var tlsCfg *tls.Config
+		var err error
 
-	if cfg.Server.Rest.GetEnablePprof() {
-		registerHttpPprof(srv)
+		if cfg.Server.Rest.Tls.File != nil {
+			if tlsCfg, err = utils.LoadServerTlsConfigFile(
+				cfg.Server.Rest.Tls.File.GetKeyPath(),
+				cfg.Server.Rest.Tls.File.GetCertPath(),
+				cfg.Server.Rest.Tls.File.GetCaPath(),
+				cfg.Server.Rest.Tls.InsecureSkipVerify,
+			); err != nil {
+				panic(err)
+			}
+		}
+		if tlsCfg == nil && cfg.Server.Rest.Tls.Config != nil {
+			if tlsCfg, err = utils.LoadServerTlsConfig(
+				cfg.Server.Rest.Tls.Config.GetKeyPem(),
+				cfg.Server.Rest.Tls.Config.GetCertPem(),
+				cfg.Server.Rest.Tls.Config.GetCaPem(),
+				cfg.Server.Rest.Tls.InsecureSkipVerify,
+			); err != nil {
+				panic(err)
+			}
+		}
+
+		if tlsCfg != nil {
+			options = append(options, kratosRest.TLSConfig(tlsCfg))
+		}
 	}
 
-	return srv
+	return options
 }
 
 func registerHttpPprof(s *kratosRest.Server) {

tag.bat

@@ -1,11 +1,31 @@
-git tag v0.3.1
+git tag api/v0.0.5 --force
 
-git tag api/v0.0.1 --force
+git tag cache/redis/v0.0.5 --force
 
-git tag config/consul/v0.0.1 --force
+git tag oss/minio/v0.0.5 --force
 
-git tag cache/redis/v0.0.1 --force
+git tag config/apollo/v0.0.5 --force
+git tag config/consul/v0.0.5 --force
+git tag config/etcd/v0.0.5 --force
+git tag config/kubernetes/v0.0.5 --force
+git tag config/nacos/v0.0.5 --force
+git tag config/polaris/vv0.0.5 --force
 
-git tag oss/minio/v0.0.1 --force
+git tag logger/aliyun/v0.0.5 --force
+git tag logger/fluent/v0.0.5 --force
+git tag logger/logrus/v0.0.5 --force
+git tag logger/tencent/v0.0.5 --force
+git tag logger/zap/v0.0.5 --force
+
+git tag registry/consul/v0.0.5 --force
+git tag registry/etcd/v0.0.5 --force
+git tag registry/eureka/v0.0.5 --force
+git tag registry/kubernetes/v0.0.5 --force
+git tag registry/nacos/v0.0.5 --force
+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.15
 
 git push origin --tags

tracer/go.mod

@@ -0,0 +1,130 @@
+module github.com/tx7do/kratos-bootstrap/tracer
+
+go 1.23
+
+toolchain go1.23.3
+
+replace (
+	github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1
+	github.com/imdario/mergo => dario.cat/mergo v0.3.16
+
+	github.com/tx7do/kratos-bootstrap/api => ../api
+	github.com/tx7do/kratos-bootstrap/config => ../config
+)
+
+require (
+	github.com/go-chassis/sc-client v0.7.0
+	github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/eureka/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/kubernetes/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/nacos/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/polaris/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/servicecomb/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/contrib/registry/zookeeper/v2 v2.0.0-20241105072421-f8b97f675b32
+	github.com/go-kratos/kratos/v2 v2.8.2
+	github.com/go-zookeeper/zk v1.0.4
+	github.com/hashicorp/consul/api v1.30.0
+	github.com/nacos-group/nacos-sdk-go v1.1.5
+	github.com/polarismesh/polaris-go v1.5.8
+	github.com/stretchr/testify v1.9.0
+	github.com/tx7do/kratos-bootstrap/api v0.0.5
+	go.etcd.io/etcd/client/v3 v3.5.17
+	k8s.io/client-go v0.31.2
+)
+
+require (
+	github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 // indirect
+	github.com/armon/go-metrics v0.5.3 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-chassis/cari v0.9.0 // indirect
+	github.com/go-chassis/foundation v0.4.0 // indirect
+	github.com/go-chassis/openlog v1.1.3 // indirect
+	github.com/go-errors/errors v1.0.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gofrs/uuid v4.2.0+incompatible // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v1.0.2 // indirect
+	github.com/hashicorp/serf v0.10.1 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/karlseguin/ccache/v2 v2.0.8 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/polarismesh/specification v1.5.3 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.60.1 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/spf13/pflag v1.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
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
+	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	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-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
+	gopkg.in/ini.v1 v1.42.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.31.2 // indirect
+	k8s.io/apimachinery v0.31.2 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
+)

tracer/tracer.go

@@ -1,4 +1,4 @@
-package bootstrap
+package tracer
 
 import (
 	"context"
@@ -17,6 +17,7 @@ import (
 	semConv "go.opentelemetry.io/otel/semconv/v1.4.0"
 
 	conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
+	"github.com/tx7do/kratos-bootstrap/config"
 )
 
 // NewTracerExporter 创建一个导出器，支持：zipkin、otlp-http、otlp-grpc
@@ -40,7 +41,7 @@ func NewTracerExporter(exporterName, endpoint string, insecure bool) (traceSdk.S
 }
 
 // NewTracerProvider 创建一个链路追踪器
-func NewTracerProvider(cfg *conf.Tracer, serviceInfo *ServiceInfo) error {
+func NewTracerProvider(cfg *conf.Tracer, serviceInfo *config.ServiceInfo) error {
 	if cfg == nil {
 		return errors.New("tracer config is nil")
 	}

upgrade.bat

@@ -0,0 +1,91 @@
+cd api
+go get all
+go mod tidy
+
+cd ../cache/redis
+go get all
+go mod tidy
+
+cd ../../config/apollo
+go get all
+go mod tidy
+
+cd ../consul
+go get all
+go mod tidy
+
+cd ../etcd
+go get all
+go mod tidy
+
+cd ../kubernetes
+go get all
+go mod tidy
+
+cd ../nacos
+go get all
+go mod tidy
+
+cd ../polaris
+go get all
+go mod tidy
+
+cd ../../logger/aliyun
+go get all
+go mod tidy
+
+cd ../fluent
+go get all
+go mod tidy
+
+cd ../logrus
+go get all
+go mod tidy
+
+cd ../tencent
+go get all
+go mod tidy
+
+cd ../zap
+go get all
+go mod tidy
+
+cd ../../oss/minio
+go get all
+go mod tidy
+
+cd ../../registry/consul
+go get all
+go mod tidy
+
+cd ../etcd
+go get all
+go mod tidy
+
+cd ../eureka
+go get all
+go mod tidy
+
+cd ../kubernetes
+go get all
+go mod tidy
+
+cd ../nacos
+go get all
+go mod tidy
+
+cd ../polaris
+go get all
+go mod tidy
+
+cd ../servicecomb
+go get all
+go mod tidy
+
+cd ../zookeeper
+go get all
+go mod tidy
+
+cd ../../
+go get all
+go mod tidy

utils/daemon.go

@@ -1,4 +1,4 @@
-package bootstrap
+package utils
 
 import (
 	"fmt"

utils/tls.go

@@ -0,0 +1,190 @@
+package utils
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/pem"
+	"fmt"
+	"log"
+	"os"
+)
+
+// 双向验证：server端提供证书(cert和key)，还必须配置cerfiles即CA根证书，因为需要验证client端提供的证书。另外client也端必须提供一样的内容，即client端的证书(cert/key)以供server端验证，并且提供CA根证书验证server端提供的证书。
+// 单向验证：server端提供证书(cert和key)，不需要配置certfiles即CA根证书，而在客户端必须提供CA根证书，用来验证server端的证书是否有效。另外client端也不需要自己的证书，因为它不需要想server端提供验证。
+
+// LoadServerTlsConfigFile 创建服务端TLS证书认证配置
+// keyFile 服务端私钥文件路径，必须提供
+// certFile 服务端证书文件路径，必须提供
+// caFile CA根证书，如果提供则为双向认证，否则为单向认证
+// insecureSkipVerify 用来控制客户端是否证书和服务器主机名。如果设置为true,则不会校验证书以及证书中的主机名和服务器主机名是否一致。
+func LoadServerTlsConfigFile(keyFile, certFile, caFile string, insecureSkipVerify bool) (*tls.Config, error) {
+	if keyFile == "" || certFile == "" {
+		return nil, fmt.Errorf("KeyFile and CertFile must both be present[key: %v, cert: %v]", keyFile, certFile)
+	}
+
+	var cfg tls.Config
+	cfg.InsecureSkipVerify = insecureSkipVerify
+	//cfg.ServerName = "host.docker.internal"
+	//cfg.MinVersion = tls.VersionTLS13
+
+	tlsCert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err != nil {
+		log.Println("tls.LoadX509KeyPair error:", err)
+		return nil, err
+	}
+
+	cfg.Certificates = []tls.Certificate{tlsCert}
+
+	if caFile != "" {
+		cfg.ClientAuth = tls.RequireAndVerifyClientCert
+		cp, err := newCertPoolWithCaFile(caFile)
+		if err != nil {
+			log.Fatalln("read cert file error:", err)
+			return nil, err
+		}
+
+		cfg.RootCAs = cp
+		cfg.ClientCAs = cp
+	} else {
+		cfg.ClientAuth = tls.NoClientCert
+	}
+
+	return &cfg, nil
+}
+
+func LoadServerTlsConfig(keyPEMBlock, certPEMBlock, caPEMBlock []byte, insecureSkipVerify bool) (*tls.Config, error) {
+	if len(keyPEMBlock) == 0 || len(certPEMBlock) == 0 {
+		return nil, fmt.Errorf("KeyPEMBlock and CertPEMBlock must both be present[key: %v, cert: %v]", keyPEMBlock, certPEMBlock)
+	}
+
+	var cfg tls.Config
+	cfg.InsecureSkipVerify = insecureSkipVerify
+	//cfg.ServerName = "host.docker.internal"
+	//cfg.MinVersion = tls.VersionTLS13
+
+	tlsCert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
+	if err != nil {
+		log.Println("tls.X509KeyPair error:", err)
+		return nil, err
+	}
+
+	cfg.Certificates = []tls.Certificate{tlsCert}
+
+	if len(caPEMBlock) != 0 {
+		cfg.ClientAuth = tls.RequireAndVerifyClientCert
+		cp, err := newCertPool(caPEMBlock)
+		if err != nil {
+			log.Fatalln("read cert PEM error:", err)
+			return nil, err
+		}
+
+		cfg.RootCAs = cp
+		cfg.ClientCAs = cp
+	} else {
+		cfg.ClientAuth = tls.NoClientCert
+	}
+
+	return &cfg, nil
+}
+
+// LoadClientTlsConfigFile 创建客户端端TLS证书认证配置
+// keyFile 客户端私钥文件路径
+// certFile 客户端证书文件路径
+// caFile CA根证书
+func LoadClientTlsConfigFile(keyFile, certFile, caFile string) (*tls.Config, error) {
+	var cfg tls.Config
+	//cfg.InsecureSkipVerify = info.InsecureSkipVerify
+	//cfg.ServerName = "host.docker.internal"
+	//cfg.MinVersion = tls.VersionTLS13
+
+	if keyFile == "" || certFile == "" {
+		return &cfg, nil
+	}
+
+	tlsCert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err != nil {
+		log.Fatalln("read pair file error:", err)
+		return nil, err
+	}
+
+	cfg.Certificates = []tls.Certificate{tlsCert}
+
+	if caFile != "" {
+		cp, err := newCertPoolWithCaFile(caFile)
+		if err != nil {
+			log.Fatalln("read cert file error:", err)
+			return nil, err
+		}
+
+		cfg.RootCAs = cp
+	}
+
+	return &cfg, nil
+}
+
+func LoadClientTlsConfig(keyPEMBlock, certPEMBlock, caPEMBlock []byte) (*tls.Config, error) {
+	if len(keyPEMBlock) == 0 || len(certPEMBlock) == 0 {
+		return nil, fmt.Errorf("KeyPEMBlock and CertPEMBlock must both be present[key: %v, cert: %v]", keyPEMBlock, certPEMBlock)
+	}
+
+	var cfg tls.Config
+	//cfg.InsecureSkipVerify = info.InsecureSkipVerify
+	//cfg.ServerName = "host.docker.internal"
+	//cfg.MinVersion = tls.VersionTLS13
+
+	tlsCert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
+	if err != nil {
+		log.Fatalln("read pair PEM error:", err)
+		return nil, err
+	}
+
+	cfg.Certificates = []tls.Certificate{tlsCert}
+
+	if len(caPEMBlock) != 0 {
+		cp, err := newCertPool(caPEMBlock)
+		if err != nil {
+			log.Fatalln("read cert PEM error:", err)
+			return nil, err
+		}
+
+		cfg.RootCAs = cp
+	}
+
+	return &cfg, nil
+}
+
+// newCertPool creates x509 certPool with provided CA file
+func newCertPoolWithCaFile(caFile string) (*x509.CertPool, error) {
+	pemByte, err := os.ReadFile(caFile)
+	if err != nil {
+		return nil, err
+	}
+
+	return newCertPool(pemByte)
+}
+
+func newCertPool(caPEMBlock []byte) (*x509.CertPool, error) {
+	certPool := x509.NewCertPool()
+
+	var block *pem.Block
+	var cert *x509.Certificate
+	var err error
+	for {
+		block, caPEMBlock = pem.Decode(caPEMBlock)
+		if block == nil {
+			return certPool, nil
+		}
+
+		cert, err = x509.ParseCertificate(block.Bytes)
+		if err != nil {
+			return nil, err
+		}
+
+		certPool.AddCert(cert)
+	}
+
+	//if !certPool.AppendCertsFromPEM(caPEMBlock) {
+	//	return nil, fmt.Errorf("can't add CA cert")
+	//}
+	//return certPool, nil
+}