替换pb

grpc_client/v1/request/sql.validator.pb.go

@@ -5,10 +5,10 @@ package request
 
 import (
 	fmt "fmt"
+	math "math"
 	proto "github.com/golang/protobuf/proto"
 	_ "github.com/mwitkow/go-proto-validators"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
-	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

grpc_client/v1/response/sql.pb.go

@@ -0,0 +1,144 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        v3.12.4
+// source: v1/response/sql.proto
+
+package response
+
+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 TransactionResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Results string `protobuf:"bytes,1,opt,name=Results,proto3" json:"Results,omitempty"`
+}
+
+func (x *TransactionResponse) Reset() {
+	*x = TransactionResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_v1_response_sql_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TransactionResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TransactionResponse) ProtoMessage() {}
+
+func (x *TransactionResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_v1_response_sql_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 TransactionResponse.ProtoReflect.Descriptor instead.
+func (*TransactionResponse) Descriptor() ([]byte, []int) {
+	return file_v1_response_sql_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *TransactionResponse) GetResults() string {
+	if x != nil {
+		return x.Results
+	}
+	return ""
+}
+
+var File_v1_response_sql_proto protoreflect.FileDescriptor
+
+var file_v1_response_sql_proto_rawDesc = []byte{
+	0x0a, 0x15, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2f, 0x73, 0x71,
+	0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x2f, 0x0a, 0x13, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x52, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x73, 0x42, 0x20, 0x5a, 0x1e, 0x64, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x72, 0x70,
+	0x63, 0x5f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x62, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_v1_response_sql_proto_rawDescOnce sync.Once
+	file_v1_response_sql_proto_rawDescData = file_v1_response_sql_proto_rawDesc
+)
+
+func file_v1_response_sql_proto_rawDescGZIP() []byte {
+	file_v1_response_sql_proto_rawDescOnce.Do(func() {
+		file_v1_response_sql_proto_rawDescData = protoimpl.X.CompressGZIP(file_v1_response_sql_proto_rawDescData)
+	})
+	return file_v1_response_sql_proto_rawDescData
+}
+
+var file_v1_response_sql_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_v1_response_sql_proto_goTypes = []interface{}{
+	(*TransactionResponse)(nil), // 0: response.TransactionResponse
+}
+var file_v1_response_sql_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_v1_response_sql_proto_init() }
+func file_v1_response_sql_proto_init() {
+	if File_v1_response_sql_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_v1_response_sql_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TransactionResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_v1_response_sql_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_v1_response_sql_proto_goTypes,
+		DependencyIndexes: file_v1_response_sql_proto_depIdxs,
+		MessageInfos:      file_v1_response_sql_proto_msgTypes,
+	}.Build()
+	File_v1_response_sql_proto = out.File
+	file_v1_response_sql_proto_rawDesc = nil
+	file_v1_response_sql_proto_goTypes = nil
+	file_v1_response_sql_proto_depIdxs = nil
+}

grpc_client/v1/sql.pb.go

@@ -7,8 +7,8 @@
 package v1
 
 import (
-	"git.sxidc.com/service-supports/ds-sdk/grpc_client/v1/request"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	request "git.sxidc.com/service-supports/ds-sdk/grpc_client/v1/request"
+	response "git.sxidc.com/service-supports/ds-sdk/grpc_client/v1/response"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -26,25 +26,26 @@ var File_v1_sql_proto protoreflect.FileDescriptor
 var file_v1_sql_proto_rawDesc = []byte{
 	0x0a, 0x0c, 0x76, 0x31, 0x2f, 0x73, 0x71, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02,
 	0x76, 0x31, 0x1a, 0x14, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2f, 0x73,
-	0x71, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x58, 0x0a, 0x0a, 0x53, 0x71, 0x6c, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x4a, 0x0a, 0x0b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x72, 0x61,
-	0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x42,
-	0x17, 0x5a, 0x15, 0x64, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x61,
-	0x70, 0x69, 0x2f, 0x70, 0x62, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x71, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x15, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2f, 0x73, 0x71, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32,
+	0x5f, 0x0a, 0x0a, 0x53, 0x71, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x51, 0x0a,
+	0x0b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x2e, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x1d, 0x2e, 0x72, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01,
+	0x42, 0x17, 0x5a, 0x15, 0x64, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f,
+	0x61, 0x70, 0x69, 0x2f, 0x70, 0x62, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var file_v1_sql_proto_goTypes = []interface{}{
 	(*request.TransactionOperation)(nil), // 0: request.TransactionOperation
-	(*empty.Empty)(nil),                  // 1: google.protobuf.Empty
+	(*response.TransactionResponse)(nil), // 1: response.TransactionResponse
 }
 var file_v1_sql_proto_depIdxs = []int32{
 	0, // 0: v1.SqlService.Transaction:input_type -> request.TransactionOperation
-	1, // 1: v1.SqlService.Transaction:output_type -> google.protobuf.Empty
+	1, // 1: v1.SqlService.Transaction:output_type -> response.TransactionResponse
 	1, // [1:2] is the sub-list for method output_type
 	0, // [0:1] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name

grpc_client/v1/sql_grpc.pb.go

@@ -8,8 +8,8 @@ package v1
 
 import (
 	context "context"
-	"git.sxidc.com/service-supports/ds-sdk/grpc_client/v1/request"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	request "git.sxidc.com/service-supports/ds-sdk/grpc_client/v1/request"
+	response "git.sxidc.com/service-supports/ds-sdk/grpc_client/v1/response"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -46,7 +46,7 @@ func (c *sqlServiceClient) Transaction(ctx context.Context, opts ...grpc.CallOpt
 
 type SqlService_TransactionClient interface {
 	Send(*request.TransactionOperation) error
-	Recv() (*empty.Empty, error)
+	Recv() (*response.TransactionResponse, error)
 	grpc.ClientStream
 }
 
@@ -58,8 +58,8 @@ func (x *sqlServiceTransactionClient) Send(m *request.TransactionOperation) erro
 	return x.ClientStream.SendMsg(m)
 }
 
-func (x *sqlServiceTransactionClient) Recv() (*empty.Empty, error) {
-	m := new(empty.Empty)
+func (x *sqlServiceTransactionClient) Recv() (*response.TransactionResponse, error) {
+	m := new(response.TransactionResponse)
 	if err := x.ClientStream.RecvMsg(m); err != nil {
 		return nil, err
 	}
@@ -99,7 +99,7 @@ func _SqlService_Transaction_Handler(srv interface{}, stream grpc.ServerStream)
 }
 
 type SqlService_TransactionServer interface {
-	Send(*empty.Empty) error
+	Send(*response.TransactionResponse) error
 	Recv() (*request.TransactionOperation, error)
 	grpc.ServerStream
 }
@@ -108,7 +108,7 @@ type sqlServiceTransactionServer struct {
 	grpc.ServerStream
 }
 
-func (x *sqlServiceTransactionServer) Send(m *empty.Empty) error {
+func (x *sqlServiceTransactionServer) Send(m *response.TransactionResponse) error {
 	return x.ServerStream.SendMsg(m)
 }
 

sdk/transaction.go

@@ -43,7 +43,7 @@ func (tx *Transaction) ExecuteRawSql(sql string, executeParams map[string]any) e
 		return retErr
 	}
 
-	_, err = tx.stream.Recv()
+	resp, err := tx.stream.Recv()
 	if err != nil {
 		retErr = err
 		return retErr
@@ -83,7 +83,7 @@ func (tx *Transaction) ExecuteSql(name string, executeParams map[string]any) err
 		return retErr
 	}
 
-	_, err = tx.stream.Recv()
+	resp, err := tx.stream.Recv()
 	if err != nil {
 		retErr = err
 		return retErr