diff --git a/rpc/chore/chore.pb b/rpc/chore/chore.pb index c95dae1..ed1299f 100644 Binary files a/rpc/chore/chore.pb and b/rpc/chore/chore.pb differ diff --git a/rpc/chore/chore.proto b/rpc/chore/chore.proto index 80b8e34..10b2493 100644 --- a/rpc/chore/chore.proto +++ b/rpc/chore/chore.proto @@ -87,13 +87,7 @@ service Chore { get: "/admin/v3/chore/system/items" }; } - rpc Document(DocumentReq) returns (Response) { - option (google.api.http) = { - get: "/api/v3/chore/document" - body: "*" - }; - } - + rpc InternalUpload(InternalUploadReq) returns (InternalUploadData); rpc RegionsByIds(RegionsByIdsReq) returns (RegionsByIdsData); rpc InternalActionApplyLogCreate(InternalActionApplyLogCreateReq) returns (InternalActionApplyLogCreateData); diff --git a/rpc/chore/pb/chore.pb.go b/rpc/chore/pb/chore.pb.go index 63b8772..15fd68d 100644 --- a/rpc/chore/pb/chore.pb.go +++ b/rpc/chore/pb/chore.pb.go @@ -1267,15 +1267,14 @@ const file_chore_chore_proto_rawDesc = "" + "\x02ip\x18\x04 \x01(\tR\x02ip\x12!\n" + "\fbrowser_name\x18\x05 \x01(\tR\vbrowserName\"&\n" + "\x10SendPasswordResp\x12\x12\n" + - "\x04code\x18\x01 \x01(\x05R\x04code2\x82\r\n" + + "\x04code\x18\x01 \x01(\x05R\x04code2\xba\f\n" + "\x05Chore\x12P\n" + "\x06Policy\x12\x10.chore.PolicyReq\x1a\x0f.chore.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\x12\x18/api/v3/chore/oss/policy\x12P\n" + - "\x06Upload\x12\x10.chore.UploadReq\x1a\x0f.chore.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v3/chore/oss/upload\x12E\n" + - "\x0eInternalUpload\x12\x18.chore.InternalUploadReq\x1a\x19.chore.InternalUploadData\x12F\n" + + "\x06Upload\x12\x10.chore.UploadReq\x1a\x0f.chore.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v3/chore/oss/upload\x12F\n" + "\x04Test\x12\x0e.chore.TestReq\x1a\x0f.chore.Response\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v3/chore/test\x12_\n" + "\rDecryptMobile\x12\x17.chore.DecryptMobileReq\x1a\x0f.chore.Response\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/api/v3/chore/decrypt/mobile\x12L\n" + - "\aRegions\x12\x11.chore.RegionsReq\x1a\x0f.chore.Response\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/api/v3/chore/regions\x12J\n" + - "\aSendSms\x12\x11.chore.SendSmsReq\x1a\x0f.chore.Response\"\x1b\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/api/v3/sms/send\x12U\n" + + "\aRegions\x12\x11.chore.RegionsReq\x1a\x0f.chore.Response\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/api/v3/chore/regions\x12P\n" + + "\aSendSms\x12\x11.chore.SendSmsReq\x1a\x0f.chore.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/api/v3/chore/sms/send\x12U\n" + "\vAnswerItems\x12\x0f.chore.EmptyReq\x1a\x0f.chore.Response\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/admin/v3/chore/answer/items\x12X\n" + "\fAnswerStatus\x12\x10.chore.StatusReq\x1a\x0f.chore.Response\"%\x82\xd3\xe4\x93\x02\x1f\"\x1d/admin/v3/chore/answer/status\x12P\n" + "\n" + @@ -1288,8 +1287,8 @@ const file_chore_chore_proto_rawDesc = "" + "\fSystemStatus\x12\x10.chore.StatusReq\x1a\x0f.chore.Response\"%\x82\xd3\xe4\x93\x02\x1f\"\x1d/admin/v3/chore/system/status\x12P\n" + "\n" + "SystemInfo\x12\f.chore.IdReq\x1a\x0f.chore.Response\"#\x82\xd3\xe4\x93\x02\x1d\x12\x1b/admin/v3/chore/system/info\x12U\n" + - "\vSystemItems\x12\x0f.chore.EmptyReq\x1a\x0f.chore.Response\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/admin/v3/chore/system/items\x12L\n" + - "\bDocument\x12\x12.chore.DocumentReq\x1a\x0f.chore.Response\"\x1b\x82\xd3\xe4\x93\x02\x15:\x01*\x12\x10/api/v3/document\x12?\n" + + "\vSystemItems\x12\x0f.chore.EmptyReq\x1a\x0f.chore.Response\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/admin/v3/chore/system/items\x12E\n" + + "\x0eInternalUpload\x12\x18.chore.InternalUploadReq\x1a\x19.chore.InternalUploadData\x12?\n" + "\fRegionsByIds\x12\x16.chore.RegionsByIdsReq\x1a\x17.chore.RegionsByIdsData\x12o\n" + "\x1cInternalActionApplyLogCreate\x12&.chore.InternalActionApplyLogCreateReq\x1a'.chore.InternalActionApplyLogCreateData\x12?\n" + "\fSendPassword\x12\x16.chore.SendPasswordReq\x1a\x17.chore.SendPasswordRespB\x19Z\x17lone-services/rpc/choreb\x06proto3" @@ -1335,46 +1334,44 @@ var file_chore_chore_proto_depIdxs = []int32{ 15, // 0: chore.RegionsByIdsData.items:type_name -> chore.RegionItem 7, // 1: chore.Chore.Policy:input_type -> chore.PolicyReq 8, // 2: chore.Chore.Upload:input_type -> chore.UploadReq - 9, // 3: chore.Chore.InternalUpload:input_type -> chore.InternalUploadReq - 11, // 4: chore.Chore.Test:input_type -> chore.TestReq - 12, // 5: chore.Chore.DecryptMobile:input_type -> chore.DecryptMobileReq - 13, // 6: chore.Chore.Regions:input_type -> chore.RegionsReq - 17, // 7: chore.Chore.SendSms:input_type -> chore.SendSmsReq - 1, // 8: chore.Chore.AnswerItems:input_type -> chore.EmptyReq - 3, // 9: chore.Chore.AnswerStatus:input_type -> chore.StatusReq - 2, // 10: chore.Chore.AnswerInfo:input_type -> chore.IdReq - 4, // 11: chore.Chore.AnswerCreate:input_type -> chore.EditReq - 4, // 12: chore.Chore.AnswerEdit:input_type -> chore.EditReq - 5, // 13: chore.Chore.SystemEdit:input_type -> chore.SystemEditReq - 3, // 14: chore.Chore.SystemStatus:input_type -> chore.StatusReq - 2, // 15: chore.Chore.SystemInfo:input_type -> chore.IdReq - 1, // 16: chore.Chore.SystemItems:input_type -> chore.EmptyReq - 6, // 17: chore.Chore.Document:input_type -> chore.DocumentReq - 14, // 18: chore.Chore.RegionsByIds:input_type -> chore.RegionsByIdsReq - 18, // 19: chore.Chore.InternalActionApplyLogCreate:input_type -> chore.InternalActionApplyLogCreateReq - 20, // 20: chore.Chore.SendPassword:input_type -> chore.SendPasswordReq - 0, // 21: chore.Chore.Policy:output_type -> chore.Response - 0, // 22: chore.Chore.Upload:output_type -> chore.Response - 10, // 23: chore.Chore.InternalUpload:output_type -> chore.InternalUploadData - 0, // 24: chore.Chore.Test:output_type -> chore.Response - 0, // 25: chore.Chore.DecryptMobile:output_type -> chore.Response - 0, // 26: chore.Chore.Regions:output_type -> chore.Response - 0, // 27: chore.Chore.SendSms:output_type -> chore.Response - 0, // 28: chore.Chore.AnswerItems:output_type -> chore.Response - 0, // 29: chore.Chore.AnswerStatus:output_type -> chore.Response - 0, // 30: chore.Chore.AnswerInfo:output_type -> chore.Response - 0, // 31: chore.Chore.AnswerCreate:output_type -> chore.Response - 0, // 32: chore.Chore.AnswerEdit:output_type -> chore.Response - 0, // 33: chore.Chore.SystemEdit:output_type -> chore.Response - 0, // 34: chore.Chore.SystemStatus:output_type -> chore.Response - 0, // 35: chore.Chore.SystemInfo:output_type -> chore.Response - 0, // 36: chore.Chore.SystemItems:output_type -> chore.Response - 0, // 37: chore.Chore.Document:output_type -> chore.Response - 16, // 38: chore.Chore.RegionsByIds:output_type -> chore.RegionsByIdsData - 19, // 39: chore.Chore.InternalActionApplyLogCreate:output_type -> chore.InternalActionApplyLogCreateData - 21, // 40: chore.Chore.SendPassword:output_type -> chore.SendPasswordResp - 21, // [21:41] is the sub-list for method output_type - 1, // [1:21] is the sub-list for method input_type + 11, // 3: chore.Chore.Test:input_type -> chore.TestReq + 12, // 4: chore.Chore.DecryptMobile:input_type -> chore.DecryptMobileReq + 13, // 5: chore.Chore.Regions:input_type -> chore.RegionsReq + 17, // 6: chore.Chore.SendSms:input_type -> chore.SendSmsReq + 1, // 7: chore.Chore.AnswerItems:input_type -> chore.EmptyReq + 3, // 8: chore.Chore.AnswerStatus:input_type -> chore.StatusReq + 2, // 9: chore.Chore.AnswerInfo:input_type -> chore.IdReq + 4, // 10: chore.Chore.AnswerCreate:input_type -> chore.EditReq + 4, // 11: chore.Chore.AnswerEdit:input_type -> chore.EditReq + 5, // 12: chore.Chore.SystemEdit:input_type -> chore.SystemEditReq + 3, // 13: chore.Chore.SystemStatus:input_type -> chore.StatusReq + 2, // 14: chore.Chore.SystemInfo:input_type -> chore.IdReq + 1, // 15: chore.Chore.SystemItems:input_type -> chore.EmptyReq + 9, // 16: chore.Chore.InternalUpload:input_type -> chore.InternalUploadReq + 14, // 17: chore.Chore.RegionsByIds:input_type -> chore.RegionsByIdsReq + 18, // 18: chore.Chore.InternalActionApplyLogCreate:input_type -> chore.InternalActionApplyLogCreateReq + 20, // 19: chore.Chore.SendPassword:input_type -> chore.SendPasswordReq + 0, // 20: chore.Chore.Policy:output_type -> chore.Response + 0, // 21: chore.Chore.Upload:output_type -> chore.Response + 0, // 22: chore.Chore.Test:output_type -> chore.Response + 0, // 23: chore.Chore.DecryptMobile:output_type -> chore.Response + 0, // 24: chore.Chore.Regions:output_type -> chore.Response + 0, // 25: chore.Chore.SendSms:output_type -> chore.Response + 0, // 26: chore.Chore.AnswerItems:output_type -> chore.Response + 0, // 27: chore.Chore.AnswerStatus:output_type -> chore.Response + 0, // 28: chore.Chore.AnswerInfo:output_type -> chore.Response + 0, // 29: chore.Chore.AnswerCreate:output_type -> chore.Response + 0, // 30: chore.Chore.AnswerEdit:output_type -> chore.Response + 0, // 31: chore.Chore.SystemEdit:output_type -> chore.Response + 0, // 32: chore.Chore.SystemStatus:output_type -> chore.Response + 0, // 33: chore.Chore.SystemInfo:output_type -> chore.Response + 0, // 34: chore.Chore.SystemItems:output_type -> chore.Response + 10, // 35: chore.Chore.InternalUpload:output_type -> chore.InternalUploadData + 16, // 36: chore.Chore.RegionsByIds:output_type -> chore.RegionsByIdsData + 19, // 37: chore.Chore.InternalActionApplyLogCreate:output_type -> chore.InternalActionApplyLogCreateData + 21, // 38: chore.Chore.SendPassword:output_type -> chore.SendPasswordResp + 20, // [20:39] is the sub-list for method output_type + 1, // [1:20] 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 diff --git a/rpc/chore/pb/chore_grpc.pb.go b/rpc/chore/pb/chore_grpc.pb.go index 3f529db..00f194a 100644 --- a/rpc/chore/pb/chore_grpc.pb.go +++ b/rpc/chore/pb/chore_grpc.pb.go @@ -21,7 +21,6 @@ const _ = grpc.SupportPackageIsVersion9 const ( Chore_Policy_FullMethodName = "/chore.Chore/Policy" Chore_Upload_FullMethodName = "/chore.Chore/Upload" - Chore_InternalUpload_FullMethodName = "/chore.Chore/InternalUpload" Chore_Test_FullMethodName = "/chore.Chore/Test" Chore_DecryptMobile_FullMethodName = "/chore.Chore/DecryptMobile" Chore_Regions_FullMethodName = "/chore.Chore/Regions" @@ -35,7 +34,7 @@ const ( Chore_SystemStatus_FullMethodName = "/chore.Chore/SystemStatus" Chore_SystemInfo_FullMethodName = "/chore.Chore/SystemInfo" Chore_SystemItems_FullMethodName = "/chore.Chore/SystemItems" - Chore_Document_FullMethodName = "/chore.Chore/Document" + Chore_InternalUpload_FullMethodName = "/chore.Chore/InternalUpload" Chore_RegionsByIds_FullMethodName = "/chore.Chore/RegionsByIds" Chore_InternalActionApplyLogCreate_FullMethodName = "/chore.Chore/InternalActionApplyLogCreate" Chore_SendPassword_FullMethodName = "/chore.Chore/SendPassword" @@ -46,10 +45,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type ChoreClient interface { Policy(ctx context.Context, in *PolicyReq, opts ...grpc.CallOption) (*Response, error) - // 对外：服务端直传 OSS Upload(ctx context.Context, in *UploadReq, opts ...grpc.CallOption) (*Response, error) - // 对内：服务间直传 OSS（无 HTTP 暴露） - InternalUpload(ctx context.Context, in *InternalUploadReq, opts ...grpc.CallOption) (*InternalUploadData, error) Test(ctx context.Context, in *TestReq, opts ...grpc.CallOption) (*Response, error) DecryptMobile(ctx context.Context, in *DecryptMobileReq, opts ...grpc.CallOption) (*Response, error) Regions(ctx context.Context, in *RegionsReq, opts ...grpc.CallOption) (*Response, error) @@ -63,7 +59,7 @@ type ChoreClient interface { SystemStatus(ctx context.Context, in *StatusReq, opts ...grpc.CallOption) (*Response, error) SystemInfo(ctx context.Context, in *IdReq, opts ...grpc.CallOption) (*Response, error) SystemItems(ctx context.Context, in *EmptyReq, opts ...grpc.CallOption) (*Response, error) - Document(ctx context.Context, in *DocumentReq, opts ...grpc.CallOption) (*Response, error) + InternalUpload(ctx context.Context, in *InternalUploadReq, opts ...grpc.CallOption) (*InternalUploadData, error) RegionsByIds(ctx context.Context, in *RegionsByIdsReq, opts ...grpc.CallOption) (*RegionsByIdsData, error) InternalActionApplyLogCreate(ctx context.Context, in *InternalActionApplyLogCreateReq, opts ...grpc.CallOption) (*InternalActionApplyLogCreateData, error) SendPassword(ctx context.Context, in *SendPasswordReq, opts ...grpc.CallOption) (*SendPasswordResp, error) @@ -97,16 +93,6 @@ func (c *choreClient) Upload(ctx context.Context, in *UploadReq, opts ...grpc.Ca return out, nil } -func (c *choreClient) InternalUpload(ctx context.Context, in *InternalUploadReq, opts ...grpc.CallOption) (*InternalUploadData, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(InternalUploadData) - err := c.cc.Invoke(ctx, Chore_InternalUpload_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *choreClient) Test(ctx context.Context, in *TestReq, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) @@ -237,10 +223,10 @@ func (c *choreClient) SystemItems(ctx context.Context, in *EmptyReq, opts ...grp return out, nil } -func (c *choreClient) Document(ctx context.Context, in *DocumentReq, opts ...grpc.CallOption) (*Response, error) { +func (c *choreClient) InternalUpload(ctx context.Context, in *InternalUploadReq, opts ...grpc.CallOption) (*InternalUploadData, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Chore_Document_FullMethodName, in, out, cOpts...) + out := new(InternalUploadData) + err := c.cc.Invoke(ctx, Chore_InternalUpload_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -282,10 +268,7 @@ func (c *choreClient) SendPassword(ctx context.Context, in *SendPasswordReq, opt // for forward compatibility. type ChoreServer interface { Policy(context.Context, *PolicyReq) (*Response, error) - // 对外：服务端直传 OSS Upload(context.Context, *UploadReq) (*Response, error) - // 对内：服务间直传 OSS（无 HTTP 暴露） - InternalUpload(context.Context, *InternalUploadReq) (*InternalUploadData, error) Test(context.Context, *TestReq) (*Response, error) DecryptMobile(context.Context, *DecryptMobileReq) (*Response, error) Regions(context.Context, *RegionsReq) (*Response, error) @@ -299,7 +282,7 @@ type ChoreServer interface { SystemStatus(context.Context, *StatusReq) (*Response, error) SystemInfo(context.Context, *IdReq) (*Response, error) SystemItems(context.Context, *EmptyReq) (*Response, error) - Document(context.Context, *DocumentReq) (*Response, error) + InternalUpload(context.Context, *InternalUploadReq) (*InternalUploadData, error) RegionsByIds(context.Context, *RegionsByIdsReq) (*RegionsByIdsData, error) InternalActionApplyLogCreate(context.Context, *InternalActionApplyLogCreateReq) (*InternalActionApplyLogCreateData, error) SendPassword(context.Context, *SendPasswordReq) (*SendPasswordResp, error) @@ -319,9 +302,6 @@ func (UnimplementedChoreServer) Policy(context.Context, *PolicyReq) (*Response, func (UnimplementedChoreServer) Upload(context.Context, *UploadReq) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method Upload not implemented") } -func (UnimplementedChoreServer) InternalUpload(context.Context, *InternalUploadReq) (*InternalUploadData, error) { - return nil, status.Error(codes.Unimplemented, "method InternalUpload not implemented") -} func (UnimplementedChoreServer) Test(context.Context, *TestReq) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method Test not implemented") } @@ -361,8 +341,8 @@ func (UnimplementedChoreServer) SystemInfo(context.Context, *IdReq) (*Response, func (UnimplementedChoreServer) SystemItems(context.Context, *EmptyReq) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method SystemItems not implemented") } -func (UnimplementedChoreServer) Document(context.Context, *DocumentReq) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method Document not implemented") +func (UnimplementedChoreServer) InternalUpload(context.Context, *InternalUploadReq) (*InternalUploadData, error) { + return nil, status.Error(codes.Unimplemented, "method InternalUpload not implemented") } func (UnimplementedChoreServer) RegionsByIds(context.Context, *RegionsByIdsReq) (*RegionsByIdsData, error) { return nil, status.Error(codes.Unimplemented, "method RegionsByIds not implemented") @@ -430,24 +410,6 @@ func _Chore_Upload_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } -func _Chore_InternalUpload_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(InternalUploadReq) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ChoreServer).InternalUpload(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Chore_InternalUpload_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ChoreServer).InternalUpload(ctx, req.(*InternalUploadReq)) - } - return interceptor(ctx, in, info, handler) -} - func _Chore_Test_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(TestReq) if err := dec(in); err != nil { @@ -682,20 +644,20 @@ func _Chore_SystemItems_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -func _Chore_Document_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DocumentReq) +func _Chore_InternalUpload_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(InternalUploadReq) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ChoreServer).Document(ctx, in) + return srv.(ChoreServer).InternalUpload(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Chore_Document_FullMethodName, + FullMethod: Chore_InternalUpload_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ChoreServer).Document(ctx, req.(*DocumentReq)) + return srv.(ChoreServer).InternalUpload(ctx, req.(*InternalUploadReq)) } return interceptor(ctx, in, info, handler) } @@ -769,10 +731,6 @@ var Chore_ServiceDesc = grpc.ServiceDesc{ MethodName: "Upload", Handler: _Chore_Upload_Handler, }, - { - MethodName: "InternalUpload", - Handler: _Chore_InternalUpload_Handler, - }, { MethodName: "Test", Handler: _Chore_Test_Handler, @@ -826,8 +784,8 @@ var Chore_ServiceDesc = grpc.ServiceDesc{ Handler: _Chore_SystemItems_Handler, }, { - MethodName: "Document", - Handler: _Chore_Document_Handler, + MethodName: "InternalUpload", + Handler: _Chore_InternalUpload_Handler, }, { MethodName: "RegionsByIds", diff --git a/services/chore/choreclient/chore.go b/services/chore/choreclient/chore.go index 91bb498..6bd75fe 100644 --- a/services/chore/choreclient/chore.go +++ b/services/chore/choreclient/chore.go @@ -39,10 +39,7 @@ type ( Chore interface { Policy(ctx context.Context, in *PolicyReq, opts ...grpc.CallOption) (*Response, error) - // 对外：服务端直传 OSS Upload(ctx context.Context, in *UploadReq, opts ...grpc.CallOption) (*Response, error) - // 对内：服务间直传 OSS（无 HTTP 暴露） - InternalUpload(ctx context.Context, in *InternalUploadReq, opts ...grpc.CallOption) (*InternalUploadData, error) Test(ctx context.Context, in *TestReq, opts ...grpc.CallOption) (*Response, error) DecryptMobile(ctx context.Context, in *DecryptMobileReq, opts ...grpc.CallOption) (*Response, error) Regions(ctx context.Context, in *RegionsReq, opts ...grpc.CallOption) (*Response, error) @@ -56,7 +53,7 @@ type ( SystemStatus(ctx context.Context, in *StatusReq, opts ...grpc.CallOption) (*Response, error) SystemInfo(ctx context.Context, in *IdReq, opts ...grpc.CallOption) (*Response, error) SystemItems(ctx context.Context, in *EmptyReq, opts ...grpc.CallOption) (*Response, error) - Document(ctx context.Context, in *DocumentReq, opts ...grpc.CallOption) (*Response, error) + InternalUpload(ctx context.Context, in *InternalUploadReq, opts ...grpc.CallOption) (*InternalUploadData, error) RegionsByIds(ctx context.Context, in *RegionsByIdsReq, opts ...grpc.CallOption) (*RegionsByIdsData, error) InternalActionApplyLogCreate(ctx context.Context, in *InternalActionApplyLogCreateReq, opts ...grpc.CallOption) (*InternalActionApplyLogCreateData, error) SendPassword(ctx context.Context, in *SendPasswordReq, opts ...grpc.CallOption) (*SendPasswordResp, error) @@ -78,18 +75,11 @@ func (m *defaultChore) Policy(ctx context.Context, in *PolicyReq, opts ...grpc.C return client.Policy(ctx, in, opts...) } -// 对外：服务端直传 OSS func (m *defaultChore) Upload(ctx context.Context, in *UploadReq, opts ...grpc.CallOption) (*Response, error) { client := chore.NewChoreClient(m.cli.Conn()) return client.Upload(ctx, in, opts...) } -// 对内：服务间直传 OSS（无 HTTP 暴露） -func (m *defaultChore) InternalUpload(ctx context.Context, in *InternalUploadReq, opts ...grpc.CallOption) (*InternalUploadData, error) { - client := chore.NewChoreClient(m.cli.Conn()) - return client.InternalUpload(ctx, in, opts...) -} - func (m *defaultChore) Test(ctx context.Context, in *TestReq, opts ...grpc.CallOption) (*Response, error) { client := chore.NewChoreClient(m.cli.Conn()) return client.Test(ctx, in, opts...) @@ -155,9 +145,9 @@ func (m *defaultChore) SystemItems(ctx context.Context, in *EmptyReq, opts ...gr return client.SystemItems(ctx, in, opts...) } -func (m *defaultChore) Document(ctx context.Context, in *DocumentReq, opts ...grpc.CallOption) (*Response, error) { +func (m *defaultChore) InternalUpload(ctx context.Context, in *InternalUploadReq, opts ...grpc.CallOption) (*InternalUploadData, error) { client := chore.NewChoreClient(m.cli.Conn()) - return client.Document(ctx, in, opts...) + return client.InternalUpload(ctx, in, opts...) } func (m *defaultChore) RegionsByIds(ctx context.Context, in *RegionsByIdsReq, opts ...grpc.CallOption) (*RegionsByIdsData, error) { diff --git a/services/chore/internal/server/choreServer.go b/services/chore/internal/server/choreServer.go index 7ed9c8b..53b3775 100644 --- a/services/chore/internal/server/choreServer.go +++ b/services/chore/internal/server/choreServer.go @@ -28,18 +28,11 @@ func (s *ChoreServer) Policy(ctx context.Context, in *chore.PolicyReq) (*chore.R return l.Policy(in) } -// 对外：服务端直传 OSS func (s *ChoreServer) Upload(ctx context.Context, in *chore.UploadReq) (*chore.Response, error) { l := logic.NewUploadLogic(ctx, s.svcCtx) return l.Upload(in) } -// 对内：服务间直传 OSS（无 HTTP 暴露） -func (s *ChoreServer) InternalUpload(ctx context.Context, in *chore.InternalUploadReq) (*chore.InternalUploadData, error) { - l := logic.NewInternalUploadLogic(ctx, s.svcCtx) - return l.InternalUpload(in) -} - func (s *ChoreServer) Test(ctx context.Context, in *chore.TestReq) (*chore.Response, error) { l := logic.NewTestLogic(ctx, s.svcCtx) return l.Test(in) @@ -105,9 +98,9 @@ func (s *ChoreServer) SystemItems(ctx context.Context, in *chore.EmptyReq) (*cho return l.SystemItems(in) } -func (s *ChoreServer) Document(ctx context.Context, in *chore.DocumentReq) (*chore.Response, error) { - l := logic.NewDocumentLogic(ctx, s.svcCtx) - return l.Document(in) +func (s *ChoreServer) InternalUpload(ctx context.Context, in *chore.InternalUploadReq) (*chore.InternalUploadData, error) { + l := logic.NewInternalUploadLogic(ctx, s.svcCtx) + return l.InternalUpload(in) } func (s *ChoreServer) RegionsByIds(ctx context.Context, in *chore.RegionsByIdsReq) (*chore.RegionsByIdsData, error) {